From 89cec79dba02236f5f6b30009a2aff626d998837 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sat, 17 Feb 2018 17:46:09 +0000
Subject: [PATCH] update translations

---
 po/be.po       |  343 ++--
 po/be@latin.po |  343 ++--
 po/bg.po       |  342 ++--
 po/br.po       |  345 ++--
 po/ca.po       |  330 +--
 po/cs.po       |  342 ++--
 po/da.po       |  342 ++--
 po/de.po       |  479 +++--
 po/el.po       |  345 ++--
 po/en_GB.po    |  342 ++--
 po/eo.po       |  343 ++--
 po/es.po       |  342 ++--
 po/eu.po       |  345 ++--
 po/fr.po       |  338 ++--
 po/gl.po       |  345 ++--
 po/he.po       |  348 ++--
 po/hr.po       |  342 ++--
 po/hu.po       |  341 ++--
 po/it.po       |  341 ++--
 po/ja.po       |  379 ++--
 po/kk.po       |  341 ++--
 po/lt.po       |  338 ++--
 po/nb_NO.po    | 5216 +++++++++++++++++++++++-------------------------
 po/nl.po       |  342 ++--
 po/pl.po       |  341 ++--
 po/pt.po       |  345 ++--
 po/pt_BR.po    |  342 ++--
 po/ru.po       |  341 ++--
 po/sk.po       |  342 ++--
 po/sr.po       |  337 ++--
 po/sr@Latn.po  |  342 ++--
 po/sv.po       |  344 ++--
 po/tr.po       |  335 ++--
 po/uk.po       |  343 ++--
 po/zh_CN.po    |  341 ++--
 po/zh_TW.po    |  341 ++--
 36 files changed, 8584 insertions(+), 8764 deletions(-)

diff --git a/po/be.po b/po/be.po
index 4f386ae35e..fd76bf4eb6 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -471,69 +471,69 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Захаваць малюнак як..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Мае "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Праграма:Невядомая"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?Сістэма:Невядомая"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Праграма:Невядомая"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Праграмы</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr "Вы не цікавіцеся гэтым чалавекам, але ён цікавіцца Вамі"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr "Вы цікавіцеся чалавекам, але ён не цікавіцца Вамі"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Вы і гэты чалавек абодва цікавіцеся адзін адным"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Вы і гэты чалавек абодва цікавіцеся адзін адным"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы чакаеце адказу на Ваш запыт"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " рэсурс з прыярытэтам "
 
@@ -873,7 +873,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Дата"
 
@@ -883,7 +883,7 @@ msgid "Nickname"
 msgstr "Мянушка"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Паведамленне"
 
@@ -1203,6 +1203,10 @@ msgstr ""
 "Таксама хочам выказаць падзяку ўсім людзям, што збіраюць пакункі з праграмай "
 "для розных сістэмаў."
 
+#: gajim/dialogs.py:1319
+msgid "Thanks"
+msgstr ""
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
@@ -1339,7 +1343,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Назва"
@@ -1399,27 +1403,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі ў абодвух палях павінны быць аднолькавымі."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Чалавек прыйшоў"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Чалавек сышоў"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Новае паведамленне"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Новае асобнае паведамленне"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Новае прыватнае паведамленне"
 
@@ -1452,7 +1456,7 @@ msgid "Groupchat Invitation"
 msgstr "Запрашэнне ў групавую размову"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Чалавек змяніў стан"
 
@@ -1822,7 +1826,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s змяніў мянушку на %s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
@@ -2199,6 +2203,7 @@ msgid "_Accept"
 msgstr "Прыняць"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Далучыцца"
 
@@ -2220,7 +2225,7 @@ msgstr "Аб'яднаныя рахункі"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2626,48 +2631,52 @@ msgstr "Кіраўнік журналаў"
 msgid "_Join New Group Chat"
 msgstr "_Удзельнічаць у групавой размове"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Значка панэлі паведамленняў"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Паказваць толькі ў _галоўным вакне"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Адмысловы рэдактар настаўленняў"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Настаўленні пакоя"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Паказаць нягледжаныя _падзеі"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Паказаць выплыўнае вакно з наступнай нягледжанай падзеяй"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
@@ -3263,44 +3272,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Журнал размоў %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Журнал размоў"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s цяпер %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Памылка: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Цяперашні стан: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Цяперашні стан: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тэма: %s\n"
@@ -3310,26 +3319,26 @@ msgstr "Тэма: %s\n"
 msgid "_Change Status Message…"
 msgstr "З_мяніць паведамленне аб стане"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "выкарыстоўвае рахунак %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Кіраванне закладкамі"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Няма ў спісе"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Паказаць _галоўнае вакно"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Схаваць гэтае меню"
 
@@ -3466,7 +3475,6 @@ msgid "Re_gister"
 msgstr "Зарэ_гістравацца"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Далучыцца"
@@ -3622,16 +3630,16 @@ msgstr "Вы не злучаны з серверам"
 msgid "Do you really want to close them all?"
 msgstr "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Групавыя размовы"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Прыватныя размовы"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Паведамленні"
 
@@ -3726,7 +3734,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "памылка адпраўкі %s ( %s )"
@@ -4016,38 +4024,38 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Немагчыма захаваць настаўленні"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 #, fuzzy
 msgid "default"
 msgstr "Прадвызначана"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Патрэбны пароль"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Вызначце пароль GPG для рахунка %s."
 
-#: gajim/gui_interface.py:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Выбар ключоў OpenPGP"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
 
-#: gajim/gui_interface.py:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Няправільны пароль"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Паўтарыце ўвод пароля GPG альбо пстрыкніце Скасаваць."
@@ -4611,65 +4619,57 @@ msgid "show help on command"
 msgstr "паказаць даведку па загадзе"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Паказаць / схаваць галоўнае вакно"
-
-#: gajim/gajim_remote.py:93
-msgid "Pops up a window with the next pending event"
-msgstr "Паказаць выплыўнае вакно з наступнай нягледжанай падзеяй"
-
-#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Паказаць спіс усіх людзей у кантактным лісце. Звесткі пра кожнага чалавека "
 "друкуюцца на асобным радку"
 
-#: 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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "рахунак"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "паказаць людзей з пэўнага рахунка"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Паказаць спіс зарэгістраваных рахункаў"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Змяніць стан рахунка(ў)"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "стан"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, 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:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "паведамленне"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "паведамленне стану"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4677,22 +4677,22 @@ msgstr ""
 "змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх "
 "рахункаў, якія \"сінхранізуюцца з глабальным станам\""
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Змяніць стан рахунка(ў)"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "Прыяры_тэт:"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "_Зарэгістраваць новы рахунак"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4701,7 +4701,7 @@ msgstr ""
 "змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх "
 "рахункаў, якія \"сінхранізуюцца з глабальным станам\""
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4711,29 +4711,29 @@ msgstr ""
 "рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', без "
 "'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "змест паведамлення"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Калі вызначана, паведамленне будзе зашыфраванае адкрытым ключом"
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr "Калі вызначана, паведамленне будзе адпраўленае праз гэты рахунак"
 
-#: gajim/gajim_remote.py:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4743,120 +4743,120 @@ msgstr ""
 "рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', без "
 "'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "тэма"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "тэма паведамлення"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Атрымаць падрабязныя звесткі пра чалавека"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID чалавека"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Атрымаць падрабязныя звесткі аб рахунку"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Назва рахунка"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Адправіць файл чалавеку"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "файл"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Месца файла"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "Калі вызначана, файл будзе адпраўлены праз гэты рахунак"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Паказаць спіс усіх настаўленняў і іх значэнні"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Выстаўляе значэнне 'ключа' ў 'значэнне'"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "ключ=значэнне"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'ключ' ёсць назваю настаўлення, 'значэнне' ёсць выстаўляемым значэннем"
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Выдаляе ўласцівасць"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "ключ"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "назва выдаляемай уласцівасці"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запісвае бягучыя настаўленні Gajim у файл .config"
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Выдаліць чалавека з спіса"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Калі вызначана, то імя чалавека выбіраецца з спіса гэтага рахунка"
 
-#: gajim/gajim_remote.py:219
+#: gajim/gajim_remote.py:211
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Вяртае бягучы стан (глабальны, калі не вызначаны рахунак)"
 
-#: gajim/gajim_remote.py:226
+#: gajim/gajim_remote.py:218
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Вяртае бягучае паведамленне аб стане (глабальнае, калі не вызначаны рахунак)"
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Вяртае колькасць нечытаных паведамленняў"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Адправіць асаблівы XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "Адправіць XML"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4865,17 +4865,17 @@ msgstr ""
 "Рахунак, на які будзе адпраўлены xml; калі не вызначаны, xml будзе "
 "адпраўлены на ўсе рахункі"
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Змяніць стан"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Мянушка не знойдзеная: %s"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4884,21 +4884,16 @@ msgstr ""
 "Рахунак, на які будзе адпраўлены xml; калі не вызначаны, xml будзе "
 "адпраўлены на ўсе рахункі"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Праверце, ці працуе avahi-daemon."
 
-#: gajim/gajim_remote.py:261
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Паказаць / схаваць галоўнае вакно"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Не хапае аргумента \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4907,31 +4902,31 @@ msgstr ""
 "'%s' няма ў Вашым спісе.\n"
 "Калі ласка, вызначце рахунак для адпраўкі паведамлення."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "У Вас няма актыўнага рахунка"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s не знойдзены"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4942,7 +4937,7 @@ msgstr ""
 "Карыстанне: %s загад [аргументы]\n"
 "Загад ёсць адным з:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4951,7 +4946,7 @@ msgstr ""
 "Надта шмат аргументаў. \n"
 "Увядзіце \"%s help %s\" для падрабязнейшых звестак"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5125,7 +5120,7 @@ msgstr "Канец тыдня"
 msgid "Weekend!"
 msgstr "Выходныя!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5135,62 +5130,62 @@ msgstr ""
 "Выдаліце яго з дапамогай адмысловай праграмы, напр., http://jru.jabberstudio."
 "org/"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запыт адпіскі ад %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Аўтарызацыя забраная"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Новае асобнае паведамленне ад %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Новае прыватнае паведамленне ў групавой размове %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Новае паведамленне ад %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Новае паведамленне ад %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s змяніў стан"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s прыйшоў"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s сышоў"
@@ -6255,11 +6250,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Прайграць гук пры атрыманні паведамлення MUC."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "зялёны"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "садавіна"
 
@@ -6407,11 +6402,11 @@ msgstr "%s з'яўляецца дырэкторыяй, але павінны б
 msgid "Error: cannot open %s for reading"
 msgstr "Памылка: немагчыма прачытаць %s"
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "перанос базы журналаў у індэкс"
 
@@ -8107,7 +8102,7 @@ msgid "Status:"
 msgstr "Стан:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Весці журнал размоў"
 
@@ -10482,6 +10477,11 @@ msgstr "Людзі"
 msgid "Passphrase"
 msgstr "Пароль"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Імя чалавека"
+
 #: gajim/data/gui/history_window.ui:51
 #, fuzzy
 msgid "Search:"
@@ -10495,7 +10495,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
@@ -11090,6 +11090,13 @@ msgstr "Нядаўна:"
 msgid "Plugin manager"
 msgstr "Памылка злучэння"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Паказаць / схаваць галоўнае вакно"
+
+#, fuzzy
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Паказаць / схаваць галоўнае вакно"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "рахунка %s"
@@ -11846,10 +11853,6 @@ msgstr "Памылка злучэння"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "сочыць за размовай"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Імя чалавека"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Групавыя размовы"
diff --git a/po/be@latin.po b/po/be@latin.po
index 1758513e5d..1544153001 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -474,35 +474,35 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Zapišy vyjavu jak..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Nie razmaÅ­laju "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nieviadomy"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?AS:Nieviadomaja"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Klijent:Nieviadomy"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikacyi</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -510,7 +510,7 @@ msgid ""
 msgstr ""
 "Hety kantakt cikavicca tvajim statusam, ale ciabie jahony status nie cikavić"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -518,27 +518,27 @@ msgid ""
 msgstr ""
 "Ty cikaviśsia statusam hetaha kantaktu, ale jaho nie cikavić tvoj status"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Ty i hety kantakt uzajemna cikaviciesia statusam adno adnaho"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 #, 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:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Ty čakaješ adkazu kantaktu na zapyt aŭtaryzacyi"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " krynica z pryjarytetam "
 
@@ -878,7 +878,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Data"
 
@@ -888,7 +888,7 @@ msgid "Nickname"
 msgstr "Mianuška"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Paviedamleńnie"
 
@@ -1203,6 +1203,10 @@ msgstr ""
 msgid "we would like to thank all the package maintainers."
 msgstr "I ŭrešcie, chočacca padziakavać usim apiekunam pakietaŭ."
 
+#: gajim/dialogs.py:1319
+msgid "Thanks"
+msgstr ""
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
@@ -1339,7 +1343,7 @@ 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:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
-#: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
+#: gajim/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nazva"
@@ -1399,27 +1403,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Parolu ŭ abodvuch palach nie pavinny roźnicca."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Kantakt dałučyŭsia"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Kantakt adłučyŭsia"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Novaje paviedamleńnie"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Novaje asobnaje paviedamleńnie"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Novaje pryvatnaje paviedamleńnie"
 
@@ -1452,7 +1456,7 @@ msgid "Groupchat Invitation"
 msgstr "Zaprašeńnie ŭ pakoj"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Kantakt źmianiŭ status"
 
@@ -1823,7 +1827,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s ciapier viadomy jak %s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s maje ciapier status %(status)s"
@@ -2200,6 +2204,7 @@ msgid "_Accept"
 msgstr "Dazvol"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Dałučysia"
 
@@ -2221,7 +2226,7 @@ msgstr "Abjadnanyja konty"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2630,48 +2635,52 @@ msgstr "Kiraŭnik žurnałaŭ"
 msgid "_Join New Group Chat"
 msgstr "_Dałučysia da pakoju"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Pakazvaj _ikonu ŭ poli nahadvańnia"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Redaktar dadatkovych naładaŭ"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Kanfihuracyja pakoju"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Pakažy ŭsie niahledžanyja _padzieji"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Adčyniaje akno z nastupnym niečytanym paviedamleńniem"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
@@ -3266,44 +3275,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Žurnał razmoŭ z %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Žurnał razmoŭ"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Tekst pamyłki: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Dziejny status: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Dziejny status: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -3313,26 +3322,26 @@ msgstr "Tema: %s\n"
 msgid "_Change Status Message…"
 msgstr "Ź_miani paviedamleńnie statusu"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "praz kont %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Kiruj zakładkami"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Niama ŭ śpisie kantaktaŭ"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Pakažy _śpis kantaktaŭ"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Schavaj hetaje menu"
 
@@ -3468,7 +3477,6 @@ msgid "Re_gister"
 msgstr "_Zarehistrujsia"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Dałučysia"
@@ -3625,16 +3633,16 @@ msgstr "Niama złučeńnia z serveram"
 msgid "Do you really want to close them all?"
 msgstr "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Pakoji"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Pryvatnyja razmovy"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Paviedamleńni"
 
@@ -3729,7 +3737,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "pamyłka dasyłańnia %s ( %s )"
@@ -4020,38 +4028,38 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Niemahčyma zapisać tvaje nałady i opcyi"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 #, fuzzy
 msgid "default"
 msgstr "Zmoŭčany"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Musiš vyznačyć parol"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Vybar kluča OpenPGP"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Niapravilny parol"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Kali łaska, vyznač parol GPG znoŭ albo naciśni knopku \"Anuluj\"."
@@ -4615,65 +4623,57 @@ msgid "show help on command"
 msgstr "pakažy daviedku pa zahadzie"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "kont"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "pakažy kantakty akreślenaha kontu"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Pakazvaje śpis zarehistravanych kontaŭ"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Źmianiaje status kontu albo kontaŭ"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "status"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, 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:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "paviedamleńnie"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "paviedamlennie statusu"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4682,22 +4682,22 @@ msgstr ""
 "dla Å­sich kontaÅ­, dla jakich vystaÅ­lenaja opcyja \"Synchranizuj z hlabalnym "
 "statusam\""
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Źmianiaje status kontu albo kontaŭ"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "Pryjary_tet:"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Ja chaču za_rehistravać novy kont"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4707,7 +4707,7 @@ msgstr ""
 "dla Å­sich kontaÅ­, dla jakich vystaÅ­lenaja opcyja \"Synchranizuj z hlabalnym "
 "statusam\""
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4717,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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "źmiest paviedamleńnia"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4750,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:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "tema"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "tema paviedamleńnia"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID kantaktu"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Nazva kontu"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Dasyłaje kantaktu fajł"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "fajł"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Ściežka da fajłu"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 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:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Pakazvaje ŭsie nałady i ichnyja vartaści"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Akreślivaje dla 'kluča' 'vartaść'"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "kluč=vartaść"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Vydalaje naładu"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "kluč"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "nazva vydalenaj nałady"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisvaje dziejnyja nałady Gajima ŭ fajł .config"
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Viartaje kolkaść niečytanych paviedamleńniaŭ"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Dasyłaje svoj XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML dla dasyłańnia"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4873,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:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Źmiani status"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Mianuška nia znojdziena: %s"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4892,21 +4892,16 @@ msgstr ""
 "Kont, na jaki budzie dasłany XML; kali kont nie akreśleny, XML budzie "
 "dasłany na ŭsie konty"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Kali Å‚aska, pravier, ci pracuje avahi-daemon."
 
-#: gajim/gajim_remote.py:261
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Nie staje arhumenta \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4915,31 +4910,31 @@ msgstr ""
 "'%s' niama ŭ tvajim śpisie kantaktaŭ.\n"
 "Kali łaska, akreśli kont dla dasyłańnia paviedamleńnia."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Nivodny kont nia dziejny"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Arhumenty:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s nia znojdzieny"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4950,7 +4945,7 @@ msgstr ""
 "Užyvańnie: %s zahad [arhumenty]\n"
 "Zahadam moža być adzin z nastupnych vyrazaŭ:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4959,7 +4954,7 @@ msgstr ""
 "Nadta Å¡mat arhumentaÅ­. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5133,7 +5128,7 @@ msgstr "Kaniec tydnia"
 msgid "Weekend!"
 msgstr "Vychodny!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5143,62 +5138,62 @@ msgstr ""
 "kantaktaŭ. Vydal jaho z dapamohaj pryłady kiravańnia śpisam kantaktaŭ, "
 "naprykład, http://jru.jabberstudio.org/"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "zapyt adpiski ad %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "AÅ­taryzacyja anulavanaja"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Novaje asobnaje paviedamleńnie ad %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Novaje pryvatnaje paviedamleńnie ŭ pakoji %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Novaje paviedamleńnie ad %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Novaje paviedamleńnie ad %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s źmianiŭ status"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s dałučyŭsia"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s adłučyŭsia"
@@ -6276,11 +6271,11 @@ msgstr ""
 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:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "zialony"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "bakaleja"
 
@@ -6428,11 +6423,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "indeksavańnie bazy razmoŭ"
 
@@ -8131,7 +8126,7 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Zachoŭvaj žurnał razmoŭ"
 
@@ -10512,6 +10507,11 @@ msgstr "Kantakty"
 msgid "Passphrase"
 msgstr "Parol"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Nazva kantaktu"
+
 #: gajim/data/gui/history_window.ui:51
 #, fuzzy
 msgid "Search:"
@@ -10525,7 +10525,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
@@ -11123,6 +11123,13 @@ msgstr "NiadaÅ­na:"
 msgid "Plugin manager"
 msgstr "Niemahvyma dałučycca"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
+
+#, fuzzy
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "kontu %s"
@@ -11882,10 +11889,6 @@ msgstr "Niemahvyma dałučycca"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "sočyć za razmovaj"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Nazva kantaktu"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Pakoji"
diff --git a/po/bg.po b/po/bg.po
index 370356f71f..bca770a9f4 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -487,34 +487,34 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Запазване на изображението като…"
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "имам "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Неизвестен"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Ранг:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -523,7 +523,7 @@ msgstr ""
 "Този контакт се интересува от информацията за вашето състояние, но вие не се "
 "интересувате от неговото"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -532,13 +532,13 @@ msgstr ""
 "Вие с интересувате от информацията за състоянието на този контакт, но той не "
 "се интересува от вашето"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -546,15 +546,15 @@ msgid ""
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чакате отговора на контакта относно запитването ви за записване"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Няма чакащо запитване за записване."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
@@ -889,7 +889,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Дата"
 
@@ -899,7 +899,7 @@ msgid "Nickname"
 msgstr "Псевдоним"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Съобщение"
 
@@ -1214,6 +1214,11 @@ msgstr ""
 "И не на последно място, бихме искали да благодарим на всички, които "
 "поддържат пакетите."
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Благодарен"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1355,7 +1360,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Трябва да сте свързани, за да синхронизирате контактите си."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Име"
@@ -1412,27 +1417,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Ново съобщение"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Ново еднократно съобщение"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Ново лично съобщение"
 
@@ -1465,7 +1470,7 @@ msgid "Groupchat Invitation"
 msgstr "Покана за разговор в стая"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Контактът промени състоянието си"
 
@@ -1833,7 +1838,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s вече е познат като %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s вече е %(status)s"
@@ -2215,6 +2220,7 @@ msgid "_Accept"
 msgstr "_Акаунти"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Влизане"
 
@@ -2236,7 +2242,7 @@ msgstr "Смесени акаунти"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2642,48 +2648,52 @@ msgstr "Мениджър на историята"
 msgid "_Join New Group Chat"
 msgstr "_Влизане в нова стая"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Демон за уведомления"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Показване на събитието в спис_ъка"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Редактор на настройки за напреднали"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Настройки на стаята"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Показване на всички _чакащи събития"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Показва следващото чакащо събитие в изскачащ прозорец"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Грешка в базата от данни"
 
@@ -3278,45 +3288,45 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История на разговорите с %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "История на разговорите"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Грешка при запис/четене от диска"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s вече е %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Грешка: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 #, fuzzy
 msgid "Error"
 msgstr "Грешка."
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Сегашното състояние е: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Сегашното състояние е: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -3326,26 +3336,26 @@ msgstr "Тема: %s\n"
 msgid "_Change Status Message…"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "от акаунт „%s“"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Управление на отметките"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "в с_писъка"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "П_оказване на списъка"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Скриване на това меню"
 
@@ -3480,7 +3490,6 @@ msgid "Re_gister"
 msgstr "_Регистриране"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Влизане"
@@ -3632,16 +3641,16 @@ msgstr "Не сте свързани към сървъра."
 msgid "Do you really want to close them all?"
 msgstr "Наистина ли искате да изтриете избраното съобщение?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Стаи"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Лични разговори"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Съобщения"
 
@@ -3737,7 +3746,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Грешка %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка при изпращане на %(message)s ( %(error)s )"
@@ -4050,37 +4059,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "по подразбиране"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Необходима е парола"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Няма зададен ключ на GPG"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
-#: gajim/gui_interface.py:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Грешна парола"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
@@ -4648,48 +4657,40 @@ msgid "show help on command"
 msgstr "показване на помощ за команда"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Показва или скрива списъка"
-
-#: gajim/gajim_remote.py:93
-msgid "Pops up a window with the next pending event"
-msgstr "Показва следващото чакащо събитие в изскачащ прозорец"
-
-#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Показване на списък с всички контакти. Всеки контакт се появява на отделен "
 "ред"
 
-#: 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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "акаунт"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "показва само контактите на дадения акаунт"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Показване на списък с регистрираните акаунти"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "състояние"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4699,17 +4700,17 @@ msgstr ""
 "away (отсъствам), xa (не съм на разположение), dnd (зает), invisible "
 "(невидим)"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "съобщение"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "съобщение за състояние"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4718,22 +4719,22 @@ msgstr ""
 "състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
 "общото състояние“"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "Приори_тет:"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "_Искам да регистрирам нов акаунт"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4743,7 +4744,7 @@ msgstr ""
 "състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
 "общото състояние“"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4753,30 +4754,30 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID на контакта, който ще получи съобщението"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "текст на съобщението"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ако е указано, съобщението ще се шифрира, използвайки този публичен ключ"
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr "ако е указано, съобщението ще бъде изпратено от този акаунт"
 
-#: gajim/gajim_remote.py:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4786,121 +4787,121 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "тема"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "тема на съобщението"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Изпраща ново съобщение до стаята, в която сте влезли."
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "JID на стаята, която ще получи съобщението"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Получаване на подробна информация за контакта"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID на контакта"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Получаване на подробна информация за акаунта"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Име на акаунта"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Изпращане на файл до контакт"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "файл"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Път до файл"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "ако е указано, файлът бъде изпратен от този акаунт"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Показва всички настройки и техните стойности"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Настройва стойността на „ключ“ на „стойност“."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "ключ=стойност"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "„ключ“ е името на настройката, „стойност“ е стойността, която се задава"
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Изтрива обект от настройките"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "ключ"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "име на настройката за изтриване"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запазва текущото състояние на настройките във файла .config"
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Премахване на контакт от списъка"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако е указано, контактът се взима от списъка с контакти на този акаунт"
 
-#: gajim/gajim_remote.py:219
+#: gajim/gajim_remote.py:211
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Връща текущото състояние (общото, в случай, че не е указан акаунт)"
 
-#: gajim/gajim_remote.py:226
+#: gajim/gajim_remote.py:218
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Връща текущото съобщение за състояние (общото, в случай, че не е указан "
 "акаунт)"
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Връща броя непрочетени съобщения"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Изпраща указан XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML за изпращане"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4909,17 +4910,17 @@ msgstr ""
 "Акаунт, до който да се изпраща XML; ако не е указан, ще се изпрати до всички "
 "акаунти"
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Промяна на състоянието"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Псевдоним"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4928,19 +4929,15 @@ msgstr ""
 "Акаунт, до който да се изпраща XML; ако не е указан, ще се изпрати до всички "
 "акаунти"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Проверка дали Gajim е стартиран"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Показва или скрива прозореца на IPython"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Липсващ аргумент „contact_jid“"
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4949,16 +4946,16 @@ msgstr ""
 "„%s“ не е в списъка ви.\n"
 "Укажете акаунт за изпращането на това съобщение."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Нямате активен акаунт"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Изглежда Gajim не е стартиран, така че не може да ползвате gajim-remote."
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4967,16 +4964,16 @@ msgstr ""
 "Употреба: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s не е намерен"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4987,7 +4984,7 @@ msgstr ""
 "Употреба: %s команда [аргументи]\n"
 "Командата е една от:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4996,7 +4993,7 @@ msgstr ""
 "Твърде много аргументи. \n"
 "Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5170,7 +5167,7 @@ msgstr "Края на седмицата"
 msgid "Weekend!"
 msgstr "Събота и неделя!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5180,61 +5177,61 @@ msgstr ""
 "Използвайте инструменти за управление на списък като http://jru.jabberstudio."
 "org/, за да го премахнете."
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "искане за отписване от %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Стаята е била унищожена"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Вместо това може да влезете в тази стая: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Неизвестна грешка на SSL: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ново еднократно съобщение от %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ново лично съобщение от стая „%s“"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Съобщение от %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ново съобщение от %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s промени състоянието си"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s се включи"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s се изключи"
@@ -6358,11 +6355,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук за изпълнение при получаване на каквото и да е съобщение в стая."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "зелена"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "колониална"
 
@@ -6506,11 +6503,11 @@ msgstr "%s e папка, а би трябвало да е файл"
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: %s не може да бъде отворен за четене"
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "синьозелена"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "мигриране на базата от данни с дневници към индекси"
 
@@ -8151,7 +8148,7 @@ msgid "Status:"
 msgstr "Състояние:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Запазване на разговорите"
 
@@ -10454,6 +10451,11 @@ msgstr "Покана на _контакти"
 msgid "Passphrase"
 msgstr "Парола"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Име на контакта"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Търсене:"
@@ -10466,7 +10468,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "Запазване на промените на _състоянията на контактите"
@@ -11060,6 +11062,12 @@ msgstr "Скоро посетени:"
 msgid "Plugin manager"
 msgstr "Неуспех при свързването"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Показва или скрива списъка"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Показва или скрива прозореца на IPython"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "за акаунт „%s“"
@@ -12051,10 +12059,6 @@ msgstr "Неуспех при свързването"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Покана на контакти в разговора (Ctrl+G)"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Име на контакта"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Стаи"
diff --git a/po/br.po b/po/br.po
index 69c79e4721..692758c269 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -476,35 +476,35 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Enrollañ ar restr dindan..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Enrollet e-barzh: %s"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "Dianav"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "Dianav"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Dianav"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Poelladoù</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -512,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:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -521,27 +521,27 @@ msgstr ""
 "Dedennet oc'h gant bezañs an darempred-mañ, met hennezh/hounnez n'eo ket "
 "gant ho hini"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, 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:395
+#: gajim/vcard.py:398
 #, 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:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr ""
 
@@ -881,7 +881,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Deiziad"
 
@@ -891,7 +891,7 @@ msgid "Nickname"
 msgstr "Lesanv"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Kemennadenn"
 
@@ -1206,6 +1206,10 @@ msgstr ""
 msgid "we would like to thank all the package maintainers."
 msgstr "Evit echuiñ, e fell deomp trugarekaat holl gempennerien ar pakad."
 
+#: gajim/dialogs.py:1319
+msgid "Thanks"
+msgstr ""
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1341,7 +1345,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Anv"
@@ -1400,27 +1404,27 @@ 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:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Darempred luget"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Darempred diluget"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Kemennadenn nevez"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Kemennadenn simpl nevez"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Kemennadenn hiniennel nevez"
 
@@ -1453,7 +1457,7 @@ msgid "Groupchat Invitation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Darempred diluget"
@@ -1824,7 +1828,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s a zo bremañ %s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
@@ -2201,6 +2205,7 @@ msgid "_Accept"
 msgstr "Asantiñ"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "E_barzhiñ"
 
@@ -2222,7 +2227,7 @@ msgstr "Kontoù strollet"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 #, fuzzy
@@ -2634,48 +2639,53 @@ msgstr "Merour an istoradur"
 msgid "_Join New Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Implij an arlun-gelaouiñ (trayicon)"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Diskouez er _roll hepken"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Aozer kefluniañ dre ar munut"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Kefluniañ ar webgaoz"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Diskouez an holl _zarvoudoù o c'hortoz"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+#, fuzzy
+msgid "Pops up a window with the next pending event"
+msgstr "A zifoup ur prenestr gant ar gemennadenn dilenn da-heul"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
@@ -3286,44 +3296,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Istoradur flapiñ gant %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Istoradur ar gaoz"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, 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:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Ar stad a zo bremañ: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujed: %s\n"
@@ -3333,26 +3343,26 @@ msgstr "Sujed: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Kemmañ an titour-stad"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "en ur implij ar gont %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Merañ ar sinedoù"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Ket er roll"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Diskouez ar _roll-darempredoù"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Kuzhat ar meuziad-mañ"
 
@@ -3488,7 +3498,6 @@ msgid "Re_gister"
 msgstr "_Emezelañ"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "E_barzhiñ"
@@ -3647,16 +3656,16 @@ msgstr "N'oc'h ket luget d'ar servijer"
 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:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Flapoù a-stroll"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Flapoù prevez"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Kemennadennoù"
 
@@ -3754,7 +3763,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s : %(message)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fazi en ur gas %s ( %s )"
@@ -4044,38 +4053,38 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 #, fuzzy
 msgid "default"
 msgstr "Dilemel"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Ger-kuzh ret"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Dibab un alc'hwezh OpenPGP"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Ger-kuzh faos"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Adroit ho ker-kuzh GPG pe pouezit war Nullañ."
@@ -4634,65 +4643,56 @@ msgid "show help on command"
 msgstr "diskouez ar skoazell evit an urzhiad"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Diskouez pe kuzhat ar prenestr pennañ"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "kont"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "diskouez darempredoù ar gont roet hepken"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "A ziskouez roll ar c'hontoù enrollet"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "A cheñch stad ar gont pe ar c'hontoù"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "stad"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, 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:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "kemennadenn"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "titour stad"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4700,22 +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:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "A cheñch stad ar gont pe ar c'hontoù"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "Digant"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Fellout a ra din emezelañ evit krouiñ ur gont"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4724,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:130
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4735,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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "korf ar gemennadenn"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4767,160 +4767,155 @@ 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:148
+#: gajim/gajim_remote.py:140
 #, fuzzy
 msgid "subject"
 msgstr "Titl"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 #, fuzzy
 msgid "message subject"
 msgstr "Kemennadenn gaset"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Evit kargañ titouroù-munut un darempred"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID an darempred"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Evit kargañ titouroù-munut ur gont"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Anv ar gont"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Kas ur restr d'un darempred"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "restr"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Treug ar restr"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 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:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Roll an holl zibaboù hag o zalvoudoù"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "A laka talvoud an 'alc'hwezh' da 'dalvoud'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "alc'hwezh=talvoud"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "A zilam un elfenn dibab"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "touchenn"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "anv an dibab da zilemel"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "A ro an niver a gemennadennoù chomet dilenn"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr ""
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr ""
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Darempred diluget"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 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:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: gajim/gajim_remote.py:261
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Diskouez pe kuzhat ar prenestr pennañ"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4929,31 +4924,31 @@ msgstr ""
 "N'emañ ket '%s' en hor roll darempredoù.\n"
 "Resisait ar gont evit kas ur gemennadenn."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "N'ho peus kont bev ebet"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "N'eo ket bet kavet %s"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4964,14 +4959,14 @@ msgstr ""
 "Implij: %s urzhiad [arguments]\n"
 "urzhiad eo unan eus :\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5155,7 +5150,7 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5165,62 +5160,62 @@ msgstr ""
 "de contact. Utiliser un outil de gestion de liste de contact tel que http://"
 "jru.jabberstudio.org/ pour le supprimer"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Dilamet eo bet an aotre"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Kemennadenn simpl nevez digant %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, 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:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Kemennadenn nevez digant %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Kemennadenn nevez digant %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Emañ %(nickname)s o paouez lugañ"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Emañ %(nickname)s o paouez dilugañ"
@@ -6223,11 +6218,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "Glas"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr ""
 
@@ -6382,11 +6377,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "Cyan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "o krouiñ titourva an istoradur"
@@ -8080,7 +8075,7 @@ msgid "Status:"
 msgstr "Stad:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Istoradur flapiñ"
 
@@ -10462,6 +10457,11 @@ msgstr "Darempredoù"
 msgid "Passphrase"
 msgstr "Ger-kuzh"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Anv an darempred"
+
 #: gajim/data/gui/history_window.ui:51
 #, fuzzy
 msgid "Search:"
@@ -10475,7 +10475,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
@@ -11071,6 +11071,13 @@ msgstr "Nevez 'zo:"
 msgid "Plugin manager"
 msgstr "échec lors de la publication de votre vCard"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Diskouez pe kuzhat ar prenestr pennañ"
+
+#, fuzzy
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Diskouez pe kuzhat ar prenestr pennañ"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "eus ar gont %s"
@@ -11725,10 +11732,6 @@ msgstr "échec lors de la publication de votre vCard"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "a zo aketus d'ar gaozeadenn"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Anv an darempred"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Flapoù a-stroll"
diff --git a/po/ca.po b/po/ca.po
index fbcf2f0db5..277ccfad42 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 03:05+0000\n"
 "PO-Revision-Date: 2017-08-01 14:04+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -450,62 +450,62 @@ msgstr ""
 msgid "Save Image as…"
 msgstr ""
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 msgid "Save _As"
 msgstr ""
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr ""
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr ""
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr ""
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr ""
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr ""
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr ""
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr ""
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr ""
 
@@ -822,7 +822,7 @@ msgid "JID"
 msgstr ""
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr ""
 
@@ -832,7 +832,7 @@ msgid "Nickname"
 msgstr ""
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr ""
 
@@ -1117,6 +1117,10 @@ msgstr ""
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 
+#: gajim/dialogs.py:1319
+msgid "Thanks"
+msgstr ""
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1242,7 +1246,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr ""
@@ -1298,27 +1302,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr ""
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "El Contacte ha entrat"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr ""
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr ""
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr ""
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr ""
 
@@ -1351,7 +1355,7 @@ msgid "Groupchat Invitation"
 msgstr ""
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr ""
 
@@ -1701,7 +1705,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr ""
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr ""
@@ -2058,6 +2062,7 @@ msgid "_Accept"
 msgstr ""
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Entra-hi"
 
@@ -2077,7 +2082,7 @@ msgstr ""
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2442,43 +2447,47 @@ msgstr "Gestor d'Històric"
 msgid "_Join New Group Chat"
 msgstr ""
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 msgid "Show the application's version"
 msgstr ""
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 msgid "Show only critical errors"
 msgstr ""
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 msgid "Use defined profile in configuration directory"
 msgstr ""
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 msgid "Set configuration directory"
 msgstr ""
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 msgid "Show all warnings"
 msgstr ""
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
+msgstr ""
+
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
@@ -3040,44 +3049,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr ""
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Històric de converses"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr ""
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr ""
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr ""
@@ -3086,24 +3095,24 @@ msgstr ""
 msgid "_Change Status Message…"
 msgstr "_Canvia Missatge d'Estat..."
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr ""
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 msgid "_Manage Bookmarks…"
 msgstr ""
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
 msgstr ""
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr ""
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr ""
 
@@ -3230,7 +3239,6 @@ msgid "Re_gister"
 msgstr ""
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "Join"
 msgstr ""
 
@@ -3375,15 +3383,15 @@ msgstr ""
 msgid "Do you really want to close them all?"
 msgstr ""
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 msgid "?Noun:Chats"
 msgstr ""
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr ""
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr ""
 
@@ -3474,7 +3482,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr ""
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr ""
@@ -3753,36 +3761,36 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr ""
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr ""
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr ""
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 
-#: gajim/gui_interface.py:2996
+#: gajim/gui_interface.py:2997
 msgid "OpenPGP key expired"
 msgstr ""
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/gui_interface.py:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr ""
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 
@@ -4316,292 +4324,280 @@ msgid "show help on command"
 msgstr ""
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr ""
-
-#: gajim/gajim_remote.py:93
-msgid "Pops up a window with the next pending event"
-msgstr ""
-
-#: gajim/gajim_remote.py:97
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 
-#: 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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "Compte"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr ""
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 msgid "Changes the status of account(s)"
 msgstr ""
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid "?CLI:status"
 msgstr ""
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr ""
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "missatge"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr ""
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 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:120
+#: gajim/gajim_remote.py:112
 msgid "Changes the priority of account(s)"
 msgstr ""
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "Priori_tat:"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr ""
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 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:130
+#: gajim/gajim_remote.py:122
 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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: gajim/gajim_remote.py:143
+#: gajim/gajim_remote.py:135
 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:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr ""
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr ""
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr ""
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr ""
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr ""
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr ""
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr ""
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr ""
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr ""
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr ""
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr ""
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr ""
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr ""
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr ""
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr ""
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr ""
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr ""
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: gajim/gajim_remote.py:219
+#: gajim/gajim_remote.py:211
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 
-#: gajim/gajim_remote.py:226
+#: gajim/gajim_remote.py:218
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr ""
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr ""
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr ""
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr ""
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr ""
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 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:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr ""
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr ""
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr ""
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr ""
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4610,14 +4606,14 @@ msgid ""
 "Command is one of:\n"
 msgstr ""
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4789,68 +4785,68 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, 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 ""
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s han entrat"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr ""
@@ -5791,11 +5787,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr ""
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr ""
 
@@ -5936,11 +5932,11 @@ msgstr ""
 msgid "Error: cannot open %s for reading"
 msgstr ""
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr ""
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr ""
 
@@ -7529,7 +7525,7 @@ msgid "Status:"
 msgstr ""
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "Registra _les converses"
 
@@ -9664,6 +9660,10 @@ msgstr ""
 msgid "Passphrase"
 msgstr "Contrasenya"
 
+#: gajim/data/gui/history_window.ui:38
+msgid "Enter name / JID of contact or groupchat"
+msgstr ""
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Cerca:"
@@ -9676,7 +9676,7 @@ msgstr "Creca en data"
 msgid "Only searching within selected day"
 msgstr "Nomes cerca al dia seleccionat"
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 msgid "_Show status changes"
 msgstr "Mostra els canvis d'estat"
 
diff --git a/po/cs.po b/po/cs.po
index 990e467cd7..51b835a940 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -495,67 +495,67 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Uložit obrázek jako..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Má"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Client:Neznámý"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámý"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Time:Neznámý"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vztah</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, 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:391
+#: gajim/vcard.py:394
 #, 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:393
+#: gajim/vcard.py:396
 #, 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:395
+#: gajim/vcard.py:398
 #, 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:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Není zde žádný nevyřízený požadavek."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
@@ -890,7 +890,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Datum"
 
@@ -900,7 +900,7 @@ msgid "Nickname"
 msgstr "Přezdívka"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Zpráva"
 
@@ -1211,6 +1211,11 @@ msgstr ""
 "Poslední, nikoliv nejmenší, poděkování patří všem správcům instalačních "
 "balíčků."
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Děkovný"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1346,7 +1351,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Jméno"
@@ -1403,27 +1408,27 @@ 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:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Nová zpráva"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Nová jednoduché zpráva"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Nová soukromá zpráva"
 
@@ -1456,7 +1461,7 @@ msgid "Groupchat Invitation"
 msgstr "Skupinová pozvánka"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Kontakt změnil stav"
 
@@ -1820,7 +1825,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s se přejmenoval na %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je nyní %(status)s"
@@ -2199,6 +2204,7 @@ msgid "_Accept"
 msgstr "Přijmi"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Vstoupit"
 
@@ -2218,7 +2224,7 @@ msgstr "Spojené účty"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2625,48 +2631,52 @@ msgstr "Správce historie"
 msgid "_Join New Group Chat"
 msgstr "_Připojit se do diskuze"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "_Zobrazit událost v rosteru"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor rozšířeného nastavení"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Nastavení místnosti"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Zobrazit všechny čekající _události"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Zobrazí okno s další nepřečtenou událostí"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Chyba Databáze"
 
@@ -3253,44 +3263,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historie rozhovorů s %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Historie konverzace"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Chyba disku"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Chyba: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Chyba"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stav je nyní %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stav je nyní %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
@@ -3300,26 +3310,26 @@ msgstr "Předmět: %s\n"
 msgid "_Change Status Message…"
 msgstr "Z_měnit popis stavu"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "pomocí účtu %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Spravovat záložky"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "v _rosteru"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Zobrazit _Seznam"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Skryje toto menu"
 
@@ -3454,7 +3464,6 @@ msgid "Re_gister"
 msgstr "Re_gistrace"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Vstoupit"
@@ -3605,16 +3614,16 @@ msgstr "Chystáte se zavřít několik panelů"
 msgid "Do you really want to close them all?"
 msgstr "Opravdu je chcete všechny zavřít?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Diskuze"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Soukromé rozhovory"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Zprávy"
 
@@ -3710,7 +3719,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Chyba %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba při odesílání %s ( %s )"
@@ -4024,37 +4033,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "výchozí"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG klíč vypršel"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Nesprávné heslo"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, 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."
@@ -4615,48 +4624,40 @@ msgid "show help on command"
 msgstr "zobraz nápovědu k příkazu"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Zobrazí nebo skryje okno Seznamu"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "účet"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "zobraz pouze kontakty zadaného účtu"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše seznam registrovaných účtů"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Změní stav účtu nebo účtů"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "stav"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4664,17 +4665,17 @@ msgid ""
 msgstr ""
 "jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "zpráva"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "text stavu"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4682,21 +4683,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:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Změní prioritu jednoho nebo více účtů"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "priorita"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "priorita vámi přidělená účtu"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4705,7 +4706,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:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4715,29 +4716,29 @@ msgstr ""
 "volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte "
 "prostÄ› 'OpenPGP key' na ''."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, který obdrží zprávu"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "Tělo zprávy"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4747,120 +4748,120 @@ msgstr ""
 "volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte "
 "prostÄ› 'OpenPGP key' na ''."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "předmět"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "předmět zprávy"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 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:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "JID diskuze do které přijde zpráva"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Získej detailní informace o kontaktu"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Získej detailní informace o účtu"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Jméno účtu"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Pošle soubor kontaktu"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "soubor"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Cesta k souboru"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 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:187
+#: gajim/gajim_remote.py:179
 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:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastaví hodnotu klíče 'key' na hodnotu 'value'"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "klíč=hodnota"
 
 # FIXME: opet
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Smaže položku nastavení"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "klíč"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "jméno volby, která bude smazána"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Odstraní kontakt ze Seznamu"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Vrací počet nepřečtených zpráv"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Poslat vlastní XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML k odeslání"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4869,17 +4870,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:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Změnit stav"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Přezdívka kterou chete použít"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4888,19 +4889,15 @@ msgstr ""
 "Účet, ze kterého bude xml odesláno; pokud nebude uvedeno, xml bude odeslání "
 "ze všech účtů"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Zkontrolujte, zda Gajim již běží."
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Zobrazí nebo skryje okno ipythonu"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Chybí parametry \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4909,15 +4906,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:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Nemáte aktivní účet"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4926,16 +4923,16 @@ msgstr ""
 "Použití: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Parametry:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s nebyl nalezen"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4946,7 +4943,7 @@ msgstr ""
 "Použití: %s příkaz [parametry]\n"
 "Příkaz je jeden z:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4955,7 +4952,7 @@ msgstr ""
 "Příliš mnoho parametrů. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5129,7 +5126,7 @@ msgstr "Konec týdne"
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5138,61 +5135,61 @@ msgstr ""
 "JID %s neodpovídá RFC. Nebude přidáno do tvého rosteru. Použij nástroje pro "
 "správu rosteru jako je http://jru.jabberstudio.org/ k jeho odstranění"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Žádost o zrušení autorizace od %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Místnost byla zničena"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 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:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznámá SSL chyba: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová jednoduché zpráva od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, 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:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nová zpráva od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nová zpráva od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Změnil(a) stav"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se přihlásil"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se odhlásil"
@@ -6293,11 +6290,11 @@ msgstr ""
 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:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "zelený"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "potraviny"
 
@@ -6441,11 +6438,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "azurová"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "převádím záznamy historie k použítí indexů"
 
@@ -8092,7 +8089,7 @@ msgid "Status:"
 msgstr "Stav:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Zaznamenat historii konverzace"
 
@@ -10388,6 +10385,11 @@ msgstr "Odeslány kontakty:"
 msgid "Passphrase"
 msgstr "Heslo"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Jméno kontaktu"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Najít:"
@@ -10400,7 +10402,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "Zaznamenávat změny _stavu kontaktů"
@@ -10996,6 +10998,12 @@ msgstr "Nedávno:"
 msgid "Plugin manager"
 msgstr "Registrace selhala"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Zobrazí nebo skryje okno Seznamu"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Zobrazí nebo skryje okno ipythonu"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP účet %s@%s"
@@ -12021,10 +12029,6 @@ msgstr "Registrace selhala"
 #~ msgid "*"
 #~ msgstr "*"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Jméno kontaktu"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Diskuze"
diff --git a/po/da.po b/po/da.po
index 3eed9837ca..983780d114 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -479,33 +479,33 @@ msgstr "Billede kan ikke gemmes i formatet %(type)s. Gem som %(new_filename)s?"
 msgid "Save Image as…"
 msgstr "Gem Billede som..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Har"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Client:Ukendt"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?OS:Ukendt"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Tid:Ukendt"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilknytning:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -514,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:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -523,14 +523,14 @@ msgstr ""
 "Du er interesseret i kontaktens tilstedeværelses information, men han/hun er "
 "ikke interesseret i din"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, 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:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -539,15 +539,15 @@ msgstr ""
 "Du og kontakten er begge interessered i hinandens tilstedeværelses "
 "information"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Der er ikke nogen ventende abbonerings forespørgsler."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " ressource med prioritet "
 
@@ -879,7 +879,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Dato"
 
@@ -889,7 +889,7 @@ msgid "Nickname"
 msgstr "Kælenavn"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Besked"
 
@@ -1198,6 +1198,11 @@ msgstr ""
 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:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Taknemlig"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Niels Felsted Thorsen <felsted@fsfe.org>"
@@ -1334,7 +1339,7 @@ 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:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
-#: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
+#: gajim/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Navn"
@@ -1391,27 +1396,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Adgangskoderene i de to tekstindtastningsfelter må være identiske."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Kontakt Loggede Ind"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggede Ud"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Ny Besked"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Ny Enkel Besked"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Ny Privat Besked"
 
@@ -1444,7 +1449,7 @@ msgid "Groupchat Invitation"
 msgstr "Gruppesamtale Invitation"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Kontakt Ændrede Status"
 
@@ -1810,7 +1815,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s er nu kendt som %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nu %(status)s"
@@ -2196,6 +2201,7 @@ msgid "_Accept"
 msgstr "K_ontoer"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Bliv med:"
 
@@ -2215,7 +2221,7 @@ msgstr "Flettede konti"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2621,48 +2627,52 @@ msgstr "Historik HÃ¥ndterer"
 msgid "_Join New Group Chat"
 msgstr "_Deltag i Ny Gruppe Samtale"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Vis et faneblad når der kun er en samtale?"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "_Vis hændelse i kontaktvindue"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Avanceret Konfigurations Behandler"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Rum Konfigurering"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Vis Alle Ventende Hænd_elser"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Popper op et vindue ved næste hændelse"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Database Fejl"
 
@@ -3255,44 +3265,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Konversations Historik med %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Samtale Historie"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Disk Skrivefejl"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Fejl: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Fejl"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nu: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nu: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Emne: %s\n"
@@ -3302,26 +3312,26 @@ msgstr "Emne: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Ændre Status Besked"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "med konto %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Håndter Bogmærker"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "i _kontaktvinduet"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Vis _Kontaktvindue"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Skjul denne menu"
 
@@ -3455,7 +3465,6 @@ msgid "Re_gister"
 msgstr "Re_gistrer"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Bliv med:"
@@ -3605,16 +3614,16 @@ msgstr "Du er ved at lukke flere faneblade"
 msgid "Do you really want to close them all?"
 msgstr "Vil du virkelig lukke dem alle?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Gruppe Samtaler"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Beskeder"
 
@@ -3711,7 +3720,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Fejl %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fejl opstod under sending %(message)s ( %(error)s )"
@@ -4029,37 +4038,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Kunne ikke gemme din opsætning og indstillinger"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "standard"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Adgangskode Påkrævet"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG nøgle er udløbet"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Forkert Adgangskode"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Indtast din GPG adgangskode igen eller annuller."
@@ -4622,64 +4631,56 @@ msgid "show help on command"
 msgstr "Vis hjælp for kommando"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Viser eller gemmer kontaktvinduet"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "Konto"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "viser kun kontakter for den givne konto"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Udskriver en liste af registrerede konti"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 msgid "Changes the status of account(s)"
 msgstr "Ændrer status for kontoen eller konti"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "status"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, 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:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "besked"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "status besked"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4688,20 +4689,20 @@ msgstr ""
 "status for alle konti der har sat \"synkroniser med generel status\" "
 "indstillingen"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 msgid "Changes the priority of account(s)"
 msgstr "Ændrer prioriteringen for kontoen eller konti"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "prioritet"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "prioriteten du vil give til kontoen"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4709,7 +4710,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:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4719,29 +4720,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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID på den kontakt som skal modtage beskeden"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "besked indhold"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4751,125 +4752,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:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "emne"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "emne på besked"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 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:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "JID på den rum som skal modtage beskeden"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "FÃ¥ detaljeret information om kontakten"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "Kontaktens JID"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "FÃ¥ detaljeret information om kontoen"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Send en fil til en kontakt"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "fil"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Filsti"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "hvis specificeret vil filen blive sendt med denne konto"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Hvis alle indstillinger og deres værdier"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sætter værdien for 'nøglen' til 'værdi'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "nøgle=værdi"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Sletter et indstillingspunkt"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "nøgle"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "navn på den indstilling som skal slettes"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Returnerer antal ikke læste beskeder"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Sender tilpasset XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML som skal sendes"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
@@ -4877,17 +4878,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:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Ændre status"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Kælenavn som skal bruges"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4895,19 +4896,15 @@ msgstr ""
 "Den konto hvor XML vil blive sendt; hvis ikke den er specificeret, vil XML "
 "blive sendt til alle konti"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Kontroller om Gajim kører"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Viser eller gemmer ipython vinduet"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Manglende argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4916,15 +4913,15 @@ msgstr ""
 "'%s' er ikke i dit kontaktvindue.\n"
 "Specificer venligst en konto for at sende beskeden."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4933,16 +4930,16 @@ msgstr ""
 "Brug: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke fundet"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4953,7 +4950,7 @@ msgstr ""
 "Brug: %s kommando [argumenter]\n"
 "Kommando er en af:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4962,7 +4959,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5136,7 +5133,7 @@ msgstr "Slutten af ugen"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5146,61 +5143,61 @@ msgstr ""
 "kontaktvindue. Brug kontaktvindue håndterings redskaber som http://jru."
 "jabberstudio.org/ til at fjerne det."
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "forespørsel om ophør på abonnement fra %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Rummet er blevet ødelagt"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan deltage i dette rum i stedet: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukendt SSL fejl: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Besked fra %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Besked fra gruppe samtale %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Besked fra %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Besked fra %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Ændrede Status"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Loggede Ind"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Loggede Ud"
@@ -6335,11 +6332,11 @@ msgstr ""
 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:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "grøn"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "købmandsvarer"
 
@@ -6483,11 +6480,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "flytter log databasen til flere indeks"
 
@@ -8116,7 +8113,7 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Log samtale historie"
 
@@ -10412,6 +10409,11 @@ msgstr "Sendte kontakter:"
 msgid "Passphrase"
 msgstr "PGP-løsen"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Kontakt navn"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Søg:"
@@ -10424,7 +10426,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Log status ændringer hos kontakter"
@@ -11012,6 +11014,12 @@ msgstr "For nylig:"
 msgid "Plugin manager"
 msgstr "Tilslutning fejlede"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Viser eller gemmer kontaktvinduet"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Viser eller gemmer ipython vinduet"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP konto %s@%s"
@@ -12017,10 +12025,6 @@ msgstr "Tilslutning fejlede"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Inviter kontakter til samtalen (Ctrl+G)"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Kontakt navn"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Gruppesamtaler"
diff --git a/po/de.po b/po/de.po
index 830cf573b3..036dc5ee0b 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -119,7 +119,7 @@ msgstr "Sie"
 #: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
-msgstr "Gespeichert in: %s"
+msgstr "Absender: %s"
 
 #: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
 #: gajim/tooltips.py:654
@@ -129,7 +129,7 @@ msgstr "Empfänger: "
 #: gajim/filetransfers_window.py:246
 #, python-format
 msgid "Saved in: %s"
-msgstr "Absender: %s"
+msgstr "Gespeichert in: %s"
 
 #: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
@@ -337,9 +337,8 @@ msgstr "Funktion unter Windows nicht verfügbar."
 
 #: gajim/features_window.py:56
 msgid "OpenPGP message encryption"
-msgstr "OpenPGP-Verschlüsselung"
+msgstr "OpenPGP-Nachrichtenverschlüsselung"
 
-# TODO: GPG/PGP unification in original strings needed
 #: gajim/features_window.py:57
 msgid "Ability to encrypting chat messages with OpenPGP."
 msgstr "Ermöglicht die Verschlüsselung von Nachrichten per OpenPGP."
@@ -493,32 +492,32 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Bild speichern unter…"
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 msgid "Save _As"
 msgstr "Speichern _unter"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "Unbekannt"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "Unbekannt"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "Unbekannt"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "<b>Rolle:</b>"
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Gruppenzugehörigkeit:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
@@ -526,7 +525,7 @@ msgstr ""
 "Dieser Kontakt ist an Ihrem Status interessiert, aber Sie sind nicht an "
 "seinem interessiert"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
@@ -534,26 +533,26 @@ msgstr ""
 "Sie sind am Status des Kontakts interessiert, aber er ist nicht an Ihrem "
 "interessiert"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 msgid "The contact and you want to exchange presence information"
 msgstr "Sie und der Kontakt sind beide am Status des Anderen interessiert"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Sie und der Kontakt sind beide am Status des Anderen interessiert"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Es gibt keine offenen Abonnementanfragen."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " Resource mit Priorität "
 
@@ -579,11 +578,11 @@ msgstr "Proxies verwalten"
 #: gajim/data/gui/account_creation_wizard_window.ui:22
 #: gajim/data/gui/change_mood_dialog.ui:98
 msgid "None"
-msgstr "Keine"
+msgstr "Keine(r)"
 
 #: gajim/options_dialog.py:506
 msgid "Adjust to Status"
-msgstr "Mit Status abgleichen"
+msgstr "An Status anpassen"
 
 #: gajim/options_dialog.py:518
 msgid "On"
@@ -591,7 +590,7 @@ msgstr "Online"
 
 #: gajim/options_dialog.py:518
 msgid "Off"
-msgstr "Abgemeldet"
+msgstr "Deaktiviert"
 
 #: gajim/options_dialog.py:556
 msgid "Failed to get secret keys"
@@ -602,12 +601,10 @@ msgstr "Die geheimen Schlüssel konnten nicht empfangen werden."
 msgid "There is no OpenPGP secret key available."
 msgstr "Kein GPG-Schlüssel verfügbar."
 
-# TODO: GPG/PGP unification in original strings needed
 #: gajim/options_dialog.py:562
 msgid "OpenPGP Key Selection"
-msgstr "OpenPGP-Schlüssel-Auswahl"
+msgstr "OpenPGP-Schlüsselauswahl"
 
-# TODO: GPG/PGP unification in original strings needed
 #: gajim/options_dialog.py:562
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie Ihren OpenPGP-Schlüssel"
@@ -853,7 +850,7 @@ msgid "JID"
 msgstr "Jabber-ID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Datum"
 
@@ -863,7 +860,7 @@ msgid "Nickname"
 msgstr "Spitzname"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Nachricht"
 
@@ -1169,6 +1166,11 @@ msgstr "Zu guter Letzt"
 msgid "we would like to thank all the package maintainers."
 msgstr "möchten wir gerne allen Paket-Verwaltern danken."
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Dankbar"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1308,7 +1310,7 @@ 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:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
-#: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
+#: gajim/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Name"
@@ -1363,27 +1365,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Neue Nachricht"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
@@ -1416,7 +1418,7 @@ msgid "Groupchat Invitation"
 msgstr "Gruppenchat-Einladung"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Kontakt hat Status verändert"
 
@@ -1484,7 +1486,7 @@ msgstr "Filter"
 
 #: gajim/dialogs.py:3568
 msgid "XML Input"
-msgstr "<b>XML-Direkteingabe</b>"
+msgstr "XML-Direkteingabe"
 
 #: gajim/dialogs.py:3572
 msgid "Send"
@@ -1792,7 +1794,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s heißt jetzt %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ist jetzt %(status)s"
@@ -2168,8 +2170,9 @@ msgid "_Accept"
 msgstr "_Akzeptieren"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
-msgstr "_Betreten"
+msgstr "_Beitreten"
 
 #: gajim/chat_control.py:1652 gajim/roster_window.py:1991
 #: gajim/gui_interface.py:1013
@@ -2187,7 +2190,7 @@ msgstr "Alle Konten"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2491,7 +2494,7 @@ 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 bieten die Möglichkeit, mehrere Kontakte in einer Zeile zu "
+"Metakontakte bieten die Möglichkeit, mehrere Kontakte in einer Ebene zu "
 "gruppieren. Sie werden normalerweise dann verwendet, wenn dieselbe Person "
 "mehrere XMPP-Konten oder Transport-Konten hat."
 
@@ -2598,45 +2601,49 @@ msgstr "_Verlaufsmanager"
 msgid "_Join New Group Chat"
 msgstr "_Neuem Gruppenchat beitreten"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 msgid "Show the application's version"
 msgstr "Version der Anwendung anzeigen"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 msgid "Show only critical errors"
 msgstr "Nur kritische Fehler anzeigen"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 "Profildateien vollständig trennen (auch die Datenbank für "
 "Unterhaltungsverläufe und die Plugins)"
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr "XML stanzas und andere Debuginformationen anzeigen"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 msgid "Use defined profile in configuration directory"
 msgstr "Im Konfigurationsverzeichnis definiertes Profil verwenden"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 msgid "Set configuration directory"
 msgstr "Konfigurationsverzeichnis setzen"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr "Logging-System konfigurieren"
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 msgid "Show all warnings"
 msgstr "Zeige alle Warnungen"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr "Öffne iPython-Shell"
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Zeige Popup-Fenster mit dem nächsten ungelesenen Ereignis"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Datenbankfehler"
 
@@ -2646,7 +2653,7 @@ msgstr "Wie weit möchten Sie zurückgehen?"
 
 #: gajim/history_sync.py:222
 msgid "One Month"
-msgstr "Ein Monat"
+msgstr "Einen Monat"
 
 #: gajim/history_sync.py:223
 msgid "Three Months"
@@ -2658,7 +2665,7 @@ msgstr "Ein Jahr"
 
 #: gajim/history_sync.py:225
 msgid "Everything"
-msgstr "Alles"
+msgstr "Komplett"
 
 #: gajim/history_sync.py:254
 msgid "Connecting..."
@@ -2890,7 +2897,7 @@ msgstr "Jeden"
 
 #: gajim/config.py:1948
 msgid "Enter and leave only"
-msgstr "Nur betreten und verlassen"
+msgstr "Nur beitreten und verlassen"
 
 #: gajim/config.py:1949
 msgid "?print_status:None"
@@ -3220,7 +3227,7 @@ msgstr "Typ"
 
 #: gajim/advanced_configuration_window.py:176
 msgid "(None)"
-msgstr "(Keine)"
+msgstr "(Keins)"
 
 #: gajim/advanced_configuration_window.py:307
 msgid "Hidden"
@@ -3234,44 +3241,44 @@ msgstr "Rechner geht in den Ruhezustand"
 msgid "Disconnect from the network"
 msgstr "Verbindung mit dem Netzwerk trennen"
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Unterhaltungsverlauf mit %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Unterhaltungsverlauf"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Festplattenfehler"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Fehler: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Fehler"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, 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:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Der Status ist jetzt: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
@@ -3280,24 +3287,24 @@ msgstr "Thema: %s\n"
 msgid "_Change Status Message…"
 msgstr "Ändere _Statusnachricht…"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "über das Konto %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 msgid "_Manage Bookmarks…"
 msgstr "Gespeicherte Gruppenchats…"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
 msgstr "_Kontaktliste verstecken"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "_Kontaktliste anzeigen"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Dieses Menü ausblenden"
 
@@ -3430,9 +3437,8 @@ msgid "Re_gister"
 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 "Betreten"
+msgstr "Beitreten"
 
 #: gajim/disco.py:1326 gajim/data/gui/search_window.ui:23
 msgid "Search"
@@ -3580,15 +3586,15 @@ msgstr "Sie sind dabei verschiedene Tabs zu schließen"
 msgid "Do you really want to close them all?"
 msgstr "Möchten Sie wirklich alle schließen?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 msgid "?Noun:Chats"
 msgstr "Chats"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Nachrichten"
 
@@ -3686,7 +3692,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Fehler %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "Fehler beim Senden der %(message)s ( %(error)s )"
@@ -3778,7 +3784,6 @@ msgstr "Zertifikats-Passphrase benötigt"
 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:723
 msgid "Untrusted OpenPGP key"
 msgstr "Unvertrauenswürdiger OpenPGP-Schlüssel"
@@ -4009,18 +4014,18 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "Standard"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
 # TODO: GPG/PGP unification in original strings needed
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
@@ -4028,26 +4033,24 @@ msgstr ""
 "%(account)s)."
 
 # TODO: GPG/PGP unification in original strings needed
-#: gajim/gui_interface.py:2996
+#: gajim/gui_interface.py:2997
 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:2997
+#: gajim/gui_interface.py:2998
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr ""
-"Ihr GPG-Schlüssel ist abgelaufen. Sie werden ohne OpenPGP-Verschlüsselung "
-"mit %s verbunden."
+"Ihr OpenPGP-Schlüssel ist abgelaufen. Sie werden ohne OpenPGP-"
+"Verschlüsselung mit %s verbunden."
 
-#: gajim/gui_interface.py:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Falsche Passphrase"
 
 # TODO: GPG/PGP unification in original strings needed
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 "Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf "
@@ -4369,7 +4372,7 @@ msgstr "Konten zusammenführen"
 
 #: gajim/accounts_window.py:41
 msgid "Use PGP Agent"
-msgstr "PGP Agent verwenden"
+msgstr "PGP-Agent verwenden"
 
 #: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
@@ -4405,7 +4408,7 @@ msgstr "Bezeichnung des Kontos ändern"
 
 #: gajim/accounts_window.py:456
 msgid "Login"
-msgstr "Einloggen"
+msgstr "Zugangsdaten"
 
 #: gajim/accounts_window.py:465
 msgid "Connection"
@@ -4413,7 +4416,7 @@ msgstr "Verbindung"
 
 #: gajim/accounts_window.py:468
 msgid "Import Contacts"
-msgstr "Kontakte einladen"
+msgstr "Kontakte synchronisieren"
 
 #: gajim/accounts_window.py:471 gajim/accounts_window.py:654
 msgid "Client Certificate"
@@ -4421,7 +4424,7 @@ msgstr "Client-Zertifikat"
 
 #: gajim/accounts_window.py:474 gajim/accounts_window.py:569
 msgid "OpenPGP Key"
-msgstr "OpenPGP Schlüssel"
+msgstr "OpenPGP-Schlüssel"
 
 #: gajim/accounts_window.py:485 gajim/accounts_window.py:557
 msgid "Connect on startup"
@@ -4533,7 +4536,7 @@ msgstr "E-Mail"
 
 #: gajim/accounts_window.py:607
 msgid "Adjust to status"
-msgstr "Mit Status abgleichen"
+msgstr "An Status anpassen"
 
 #: gajim/accounts_window.py:634
 msgid "Enable"
@@ -4541,7 +4544,7 @@ msgstr "Aktivieren"
 
 #: gajim/accounts_window.py:641
 msgid "Port"
-msgstr "_Port"
+msgstr "Port"
 
 #: gajim/accounts_window.py:646
 msgid "Connection Options"
@@ -4589,44 +4592,36 @@ msgid "show help on command"
 msgstr "zeige Hilfe für Befehl"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Ein- oder Ausblenden des Hauptfensters"
-
-#: 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:97
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 msgid "?CLI:account"
 msgstr "Konto"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "zeige nur Kontakte für das gegebene Konto"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Gibt eine Liste registrierter Konten aus"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 msgid "Changes the status of account(s)"
 msgstr "Ändert den Status eines oder mehrerer Konten"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid "?CLI:status"
 msgstr "Status"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4634,16 +4629,16 @@ msgstr ""
 "Ein Wert von: offline, online, chat, away, xa, dnd, invisible. Wenn nicht "
 "definiert, wird der letzte Kontostatus verwendet"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 msgid "?CLI:message"
 msgstr "Nachricht"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "Statusnachricht"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4652,19 +4647,19 @@ msgstr ""
 "aller Konten für die die Option \"Kontostatus mit globalem Status "
 "synchronisieren\" aktiviert ist"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 msgid "Changes the priority of account(s)"
 msgstr "Ändert die Priorität eines oder mehrerer Konten"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "?CLI:priority"
 msgstr "Priorität"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "Priorität, die Sie dem Konto geben möchten"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4673,167 +4668,167 @@ msgstr ""
 "aller Konten für die die Option \"Kontostatus mit globalem Status "
 "synchronisieren\" aktiviert ist"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 ""
 "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 und Konto sind optional. Falls nur das Konto ohne einen OpenPGP-"
+"Schlüssel festgelegt werden soll, setzen Sie \"OpenPGP-Schlüssel\" einfach "
+"auf \"\"."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "Jabber-ID des Kontakts, der die Nachricht empfangen soll"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "Nachrichteninhalt"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr "PGP-Schlüssel"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 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 und Konto sind optional. Falls nur das Konto ohne einen OpenPGP-"
+"Schlüssel festgelegt werden soll, setzen Sie \"OpenPGP-Schlüssel\" einfach "
+"auf \"\"."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "Betreff"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "Nachrichten-Betreff"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 "Sendet eine neue Nachricht an einen Gruppenchat, dem Sie beigetreten sind."
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "Jabber-ID des Gruppenchats, der die Nachricht empfangen soll"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Zeige detaillierte Informationen über einen Kontakt"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "Jabber-ID des Kontakts"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Zeige detaillierte Informationen über ein Konto"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Name des Kontos"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Sendet dem Kontakt eine Datei"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "Datei"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Dateipfad"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "Wenn angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Zeigt alle Einstellungen und ihre Werte"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setzt den Wert von 'Schlüssel' auf 'Wert'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "Schlüssel=Wert"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 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 einzustellende "
 "Wert"
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Löscht eine Einstellung"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "Schlüssel"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "Name der zu löschenden Einstellung"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Entfernt den Kontakt aus der Kontaktliste"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Gibt die Anzahl der ungelesenen Nachrichten zurück"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Benutzerdefinierten XML-Code senden"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "Zu sendender XML-Code"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
@@ -4841,15 +4836,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:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr "Avatar ändern"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr "Bild, das benutzt werden soll"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4857,19 +4852,15 @@ msgstr ""
 "Konto, für das der Avatar definiert wird; falls nicht angegeben, wird der "
 "Avatar allen Konten zugewiesen"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Bitte überprüfen Sie, ob Gajim läuft"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Ein- oder Ausblenden des Hauptfensters"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Fehlendes Argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4878,17 +4869,17 @@ msgstr ""
 "'%s' ist nicht in Ihrer Kontaktliste.\n"
 "Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Kein aktives Konto"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4897,16 +4888,16 @@ msgstr ""
 "Verwendung: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Parameter:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4919,7 +4910,7 @@ msgstr ""
 "\n"
 "Der Befehl ist einer von:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4929,7 +4920,7 @@ msgstr ""
 "Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
 "erhalten"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5104,7 +5095,7 @@ msgstr "Ende der Woche"
 msgid "Weekend!"
 msgstr "Wochenende!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5114,61 +5105,61 @@ msgstr ""
 "hinzugefügt. Verwenden Sie ein Kontaktlistenverwaltungswerkzeug wie http://"
 "jru.jabberstudio.org/, um sie zu entfernen."
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Anfrage zur Beendigung des Abonnements von %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Der Gruppenchat wurde aufgelöst"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Sie können stattdessen diesem Gruppenchat beitreten: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unbekannter SSL-Fehler: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Einzelne neue Nachricht von %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Neue private Nachricht aus dem Gruppenchat %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s änderte seinen Status"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s angemeldet"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s abgemeldet"
@@ -5316,7 +5307,7 @@ msgstr "Schriftart der Statusnachricht."
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
-"Liste (getrennt durch Leerzeichen) von Zeilen (Konten und Gruppen), die "
+"Liste (getrennt durch Leerzeichen) von Ebenen (Konten und Gruppen), die "
 "eingeklappt sind."
 
 #: gajim/common/config.py:123
@@ -5441,15 +5432,15 @@ msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit"
 msgstr ""
-"Wie viele der letzten Nachrichten sollen beim Betreten eines Gruppenchats "
+"Wie viele der letzten Nachrichten sollen beim Beitreten eines Gruppenchats "
 "abgefragt werden? -1 bedeutet kein Limit"
 
 #: gajim/common/config.py:185
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit"
 msgstr ""
-"Wie viele Minuten zurück sollen Nachrichten beim Betreten eines Gruppenchats "
-"abgefragt werden? -1 bedeutet kein Limit"
+"Wie viele Minuten zurück sollen Nachrichten beim Beitreten eines "
+"Gruppenchats abgefragt werden? -1 bedeutet kein Limit"
 
 #: gajim/common/config.py:186
 msgid ""
@@ -5472,12 +5463,12 @@ msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr ""
-"Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch "
-"(Standardeinstellung im ICQ-Client Mirabilis)."
+"Sende Nachricht mit Strg+Enter und füge mit Enter einen Zeilenumbruch ein "
+"(Standardeinstellung im ICQ-Client)."
 
 #: gajim/common/config.py:190
 msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Wie viele Zeilen für Strg+BildAuf gespeichert werden."
+msgstr "Wie viele Zeilen für den Befehl Strg+BildAuf gespeichert werden."
 
 #: gajim/common/config.py:193
 #, python-format
@@ -5654,7 +5645,7 @@ msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
 msgstr ""
-"Falls deaktiviert, wird keine Statuszeile im Chat angezeigt, wenn ein "
+"Falls deaktiviert, wird keine Statusnachricht im Chat angezeigt, wenn ein "
 "Kontakt seinen Status oder seine Statusnachricht ändert."
 
 #: gajim/common/config.py:249
@@ -5666,7 +5657,7 @@ msgid ""
 "group chat."
 msgstr ""
 "Kann \"none\", \"all\" oder \"in_and_out\" sein. Falls \"none\", werden "
-"keine Status-Zeilen mehr in Gruppenchats angezeigt, wenn jemand seinen "
+"keine Statusnachrichten 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 dem Gruppenchat beitritt oder ihn verlässt."
@@ -5714,9 +5705,9 @@ msgid ""
 "chat. Turn this option to False to stop sending sha info in group chat "
 "presences."
 msgstr ""
-"Jabberd1.4 verarbeitet keine SHA-Informationen, wenn ein passwortgeschützter "
-"Gruppenchat betreten wird. Falls aktiviert, werden in Gruppenchats keine SHA-"
-"Informationen gesendet."
+"Jabberd1.4 verarbeitet keine SHA-Informationen, wenn einem "
+"passwortgeschützten Gruppenchat beigetreten wird. Falls aktiviert, werden in "
+"Gruppenchats keine SHA-Informationen gesendet."
 
 #: gajim/common/config.py:263
 msgid ""
@@ -5762,11 +5753,11 @@ 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 Gruppenchat-Fenster."
+msgstr "Versteckt den Banner im Gruppenchat-Fenster"
 
 #: gajim/common/config.py:268
 msgid "Hides the banner in two persons chat window"
-msgstr "Versteckt das Banner im Zwei-Personen-Chatfenster."
+msgstr "Versteckt den Banner im Einzelnachrichtenfenster"
 
 #: gajim/common/config.py:269
 msgid "Hides the group chat occupants list in group chat window."
@@ -5839,8 +5830,8 @@ msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
-"Falls aktiviert, wird die Anzahl der angemeldeten und gesamten Kontakte in "
-"den Konto- und Gruppenzeilen angezeigt."
+"Falls aktiviert, wird die Anzahl der angemeldeten und Gesamtanzahl der "
+"Kontakte auf Konto- und Gruppenebene angezeigt."
 
 #: gajim/common/config.py:279
 msgid ""
@@ -5869,8 +5860,8 @@ msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
-"Maximale Anzahl Zeilen, die in einem Gespräch angezeigt werden. Die ältesten "
-"Zeilen werden gelöscht."
+"Maximale Anzahl von Zeilen, die in einem Gespräch angezeigt werden. Die "
+"ältesten Zeilen werden ausgeblendet."
 
 #: gajim/common/config.py:283
 msgid ""
@@ -5974,7 +5965,7 @@ msgstr ""
 
 #: gajim/common/config.py:304
 msgid "Show a mini avatar in chat window tabs and in window icon"
-msgstr "Miniavatar Chatfenstertabs und Fenstericons anzeigen"
+msgstr "Kleinen Avatar in Chatfenster-Tabs und in Fenstericon anzeigen"
 
 #: gajim/common/config.py:305
 msgid "If True, Gajim will use the Systems Keyring to store account passwords."
@@ -6239,7 +6230,7 @@ msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
-"Wie viele der letzten Nachrichten sollen beim Betreten eines Gruppenchats "
+"Wie viele der letzten Nachrichten sollen beim Beitreten eines Gruppenchats "
 "abgefragt werden? -1 bedeutet kein Limit, -2 bedeutet globale Einstellung"
 
 #: gajim/common/config.py:482
@@ -6247,8 +6238,9 @@ 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 Nachrichten beim Betreten eines Gruppenchats "
-"abgefragt werden? -1 bedeutet kein Limit, -2 bedeutet globale Einstellung"
+"Wie viele Minuten zurück sollen Nachrichten beim Beitreten eines "
+"Gruppenchats abgefragt werden? -1 bedeutet kein Limit, -2 bedeutet globale "
+"Einstellung"
 
 #: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
@@ -6351,11 +6343,11 @@ msgid "Sound to play when any MUC message arrives."
 msgstr ""
 "Klang, der bei einer neuen Gruppenchat-Nachricht abgespielt werden soll"
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "Grün"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "Lebensmittel"
 
@@ -6496,11 +6488,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "migriere Logdatenbank zu Indizes"
 
@@ -7992,7 +7984,7 @@ msgstr "blockierte Kontakte"
 
 #: gajim/data/gui/advanced_configuration_window.ui:13
 msgid "Advanced Configuration Editor"
-msgstr "Erweiterter Konfigurationseditor"
+msgstr "Erweiterter Konfigurationseditor (ACE)"
 
 #: gajim/data/gui/advanced_configuration_window.ui:35
 msgid "Filter:"
@@ -8067,7 +8059,7 @@ msgstr "_Name:"
 
 #: gajim/data/gui/manage_proxies_window.ui:161
 msgid "_Type:"
-msgstr "_Art:"
+msgstr "_Typ:"
 
 #: gajim/data/gui/manage_proxies_window.ui:205
 msgid "<b>Properties</b>"
@@ -8134,7 +8126,7 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "Unterhaltungsver_lauf speichern"
 
@@ -8555,7 +8547,7 @@ msgstr "_Schließen"
 
 #: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
-msgstr "Versteckt das Fenster."
+msgstr "Versteckt das Fenster"
 
 #: gajim/data/gui/filetransfers.ui:226
 msgid "_Notify me when a file transfer is complete"
@@ -8728,15 +8720,15 @@ msgstr "Kommentare"
 
 #: gajim/data/gui/gajim_themes_window.ui:12
 msgid "Account row"
-msgstr "Kontozeile"
+msgstr "Kontoebene"
 
 #: gajim/data/gui/gajim_themes_window.ui:15
 msgid "Group row"
-msgstr "Gruppenzeile"
+msgstr "Gruppenebene"
 
 #: gajim/data/gui/gajim_themes_window.ui:18
 msgid "Contact row"
-msgstr "Kontaktzeile"
+msgstr "Kontaktebene"
 
 #: gajim/data/gui/gajim_themes_window.ui:21
 msgid "Chat Banner"
@@ -8787,8 +8779,8 @@ msgid ""
 "MUC Directed\n"
 "Messages"
 msgstr ""
-"An Gruppenchat\n"
-"gerichtete Nachrichten"
+"An Sie gerichtete\n"
+"Nachrichten in Gruppenchats"
 
 #: gajim/data/gui/gajim_themes_window.ui:510
 msgid "<b>Chatstate Tab Colors</b>"
@@ -8814,7 +8806,7 @@ msgstr "Nur Tippbenachrichtigung"
 
 #: gajim/data/gui/preferences_window.ui:99
 msgid "Only when pending events"
-msgstr "Nur bei anhängenden Ereignissen"
+msgstr "Nur bei anstehenden Ereignissen"
 
 #: gajim/data/gui/preferences_window.ui:113
 msgid "Pop it up"
@@ -8960,8 +8952,7 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:466
 msgid "Notify by icon when your messages are received"
-msgstr ""
-"Durch Icon darüber benachrichtigen, wenn Ihre Nachrichten empfangen wurden"
+msgstr "Empfangsbestätigung für Nachrichten durch ein Häkchen anzeigen"
 
 #: gajim/data/gui/preferences_window.ui:531
 msgid "Show avatar in chat tabs"
@@ -9328,7 +9319,7 @@ msgstr "<b>Anwendungen</b>"
 #: gajim/data/gui/preferences_window.ui:2604
 msgid "_Ignore events from contacts not in the roster"
 msgstr ""
-"Ereignisse von Kontakten, die nicht in der Kontaktliste sind, _ignorieren"
+"Ereignisse von Kontakten _ignorieren, die nicht in der Kontaktliste sind"
 
 #: gajim/data/gui/preferences_window.ui:2608
 msgid ""
@@ -9407,7 +9398,7 @@ msgstr "Ö_ffnen..."
 
 #: gajim/data/gui/preferences_window.ui:2826
 msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Erweiterter Konfigurationseditor</b>"
+msgstr "<b>Erweiterter Konfigurationseditor (ACE)</b>"
 
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
@@ -9442,7 +9433,6 @@ msgstr "_Umbenennen..."
 msgid "Edit _Groups..."
 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 "OpenPGP-Schlüssel zuweisen..."
@@ -9728,7 +9718,7 @@ 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"
+msgstr "Wählen Sie eine Gruppe oder geben Sie einen neuen Namen ein"
 
 #: gajim/data/gui/add_new_contact_window.ui:257
 msgid "A_llow this contact to view my status"
@@ -10180,7 +10170,7 @@ msgid ""
 msgstr ""
 "<b>WARNUNG:</b>\n"
 "Wenn Sie viel löschen möchten, beenden Sie Gajim vorher. Vermeiden Sie "
-"generell Löschungen von Unterhaltungen mit Kontakten, mit denen Sie gerade "
+"generell das Löschen von Unterhaltungen mit Kontakten, mit denen Sie gerade "
 "chatten."
 
 #: gajim/data/gui/history_manager.ui:335
@@ -10335,6 +10325,10 @@ msgstr "Kontakt löschen"
 msgid "Passphrase"
 msgstr "Passphrase"
 
+#: gajim/data/gui/history_window.ui:38
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Kontaktnamen, JID oder Gruppenchat eingeben"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Suchen:"
@@ -10348,7 +10342,7 @@ msgstr "_Suche auf Datum beschränken"
 msgid "Only searching within selected day"
 msgstr "Nur innerhalb des gewählten Tags suchen"
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 msgid "_Show status changes"
 msgstr "_Statusänderungen anzeigen"
 
@@ -10949,6 +10943,12 @@ msgstr "Unterhaltungsverlauf"
 msgid "Plugin manager"
 msgstr "Plugin-Manager"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Ein- oder Ausblenden des Hauptfensters"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Ein- oder Ausblenden des Hauptfensters"
+
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP-Konto %s"
 
@@ -12159,9 +12159,6 @@ msgstr "Plugin-Manager"
 #~ msgid "Export"
 #~ msgstr "Export"
 
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Bitte JID oder Kontaktnamen eingeben"
-
 #~ msgid "Groupchat Histories"
 #~ msgstr "Gruppenchatverläufe"
 
diff --git a/po/el.po b/po/el.po
index e4492ad74c..2e6183bd05 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -482,35 +482,35 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Αποθήκευση εικόνας ως..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Έχει"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Πελάτης: Άγνωστος"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?Λειτ. Σύστημα: Άγνωστο"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Πελάτης: Άγνωστος"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Εφαρμογές</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -519,7 +519,7 @@ msgstr ""
 "Αυτή η επαφή ενδιαφέρεται για την παρουσία σας ή μη, αλλά εσείς δεν "
 "ενδιαφέρεστε για την παρουσία του/της"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -528,27 +528,27 @@ msgstr ""
 "Εσείς ενδιαφέρεστε για την παρουσία αυτής της επαφής, αλλά αυτός/η δεν "
 "ενδιαφέρεται για τη δική σας"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Περιμένετε την απάντηση της επαφής για την αίτηση συνδρομής σας"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
@@ -889,7 +889,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -899,7 +899,7 @@ msgid "Nickname"
 msgstr "Όνομα χρήστη"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Μήνυμα"
 
@@ -1228,6 +1228,10 @@ msgstr ""
 msgid "we would like to thank all the package maintainers."
 msgstr "Τέλος, θα θέλαμε να ευχαριστήσουμε όλους τους διαχειριστές πακέτων."
 
+#: gajim/dialogs.py:1319
+msgid "Thanks"
+msgstr ""
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1370,7 +1374,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Όνομα"
@@ -1431,27 +1435,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Σύνδεση επαφής"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση επαφής"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Νέο μήνυμα"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Νέο μονό μήνυμα"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Νέο προσωπικό μήνυμα"
 
@@ -1484,7 +1488,7 @@ msgid "Groupchat Invitation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Η επαφή άλλαξε κατάσταση"
 
@@ -1852,7 +1856,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
@@ -2230,6 +2234,7 @@ msgid "_Accept"
 msgstr "Αποδοχή"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
@@ -2251,7 +2256,7 @@ msgstr "Συνενωμένοι λογαριασμοί"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 #, fuzzy
@@ -2671,48 +2676,53 @@ msgstr "Διαχειριστής ιστορικού"
 msgid "_Join New Group Chat"
 msgstr "_Είσοδος σε Ομαδική Συζήτηση"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Επεξεργασία ρυθμίσεων για προχωρημένους"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Ρυθμίσεις δωματίου"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Εμφάνιση όλων των γεγονότων που εκκρεμούν"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+#, fuzzy
+msgid "Pops up a window with the next pending event"
+msgstr "Εμφάνιση ενός παραθύρου με το επόμενο αδιάβαστο μήνυμα"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
@@ -3317,46 +3327,46 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Ιστορικό κουβέντας με τον %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Ιστορικό συζητήσεων"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 #, fuzzy
 msgid "Disk Error"
 msgstr "Σφάλμα:"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "Ο/Η %(nick)s είναι τώρα %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 #, fuzzy
 msgid "Error"
 msgstr "Σφάλμα:"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
@@ -3366,26 +3376,26 @@ msgstr "Θέμα: %s\n"
 msgid "_Change Status Message…"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "με χρήση του λογαριασμού %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Διαχείριση σελιδοδεικτών"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Εκτέλεση στο Τερματικό"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Εμφάνιση _λίστας επαφών"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Απόκρυψη αυτού του μενού"
 
@@ -3521,7 +3531,6 @@ msgid "Re_gister"
 msgstr "_Εγγραφή"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Συμμετοχή"
@@ -3681,16 +3690,16 @@ msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 msgid "Do you really want to close them all?"
 msgstr "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Προσωπικές συζητήσεις"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Μηνύματα"
 
@@ -3785,7 +3794,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
@@ -4080,38 +4089,38 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 #, fuzzy
 msgid "default"
 msgstr "Προεπιλογή"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Απαιτείται φράση πρόσβασης"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: gajim/gui_interface.py:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Επιλογή κλειδιού OpenPGP"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
-#: gajim/gui_interface.py:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Εσφαλμένη φράση πρόσβασης"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Παρακαλώ εισάγετε ξανά τη φράση πρόσβασης GPG σας, ή επιλέξτε Ακύρωση."
@@ -4681,49 +4690,40 @@ msgid "show help on command"
 msgstr "εμφάνιση βοήθειας στην εντολή"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
-
-#: gajim/gajim_remote.py:93
-#, fuzzy
-msgid "Pops up a window with the next pending event"
-msgstr "Εμφάνιση ενός παραθύρου με το επόμενο αδιάβαστο μήνυμα"
-
-#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Εμφανίζει όλες τις επαφές στη λίστα επαφών. Κάθε επαφή εμφανίζεται σε μια "
 "ξεχωριστή γραμμή"
 
-#: 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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "λογαριασμός"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "εμφάνιση μόνο των επαφών του συγκεκριμένου λογαριασμού"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Εμφανίζει τη λίστα των καταχωρημένων λογαριασμών"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "κατάσταση"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4732,17 +4732,17 @@ msgstr ""
 "μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, "
 "εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "μήνυμα"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "μήνυμα κατάστασης"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4751,22 +4751,22 @@ msgstr ""
 "δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν "
 "ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "Π_ροτεραιότητα:"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4776,7 +4776,7 @@ msgstr ""
 "δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν "
 "ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4788,31 +4788,31 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "περιεχόμενα μηνύματος"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "εάν καθοριστεί, το μήνυμα θα κρυπτογραφηθεί χρησιμοποιώντας αυτό το δημόσιο "
 "κλειδί"
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr "εάν οριστεί, το μήνυμα θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: gajim/gajim_remote.py:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4823,167 +4823,162 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "θέμα"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "θέμα μηνύματος"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Λήψη αναλυτικών πληροφοριών για μία επαφή"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "το JID της επαφής"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Λήψη αναλυτικών πληροφοριών για ένα λογαριασμό"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Όνομα λογαριασμού"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Αποστολή αρχείου σε μία επαφή"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "αρχείο"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Διαδρομή αρχείου"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "εάν οριστεί, το αρχείο θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Εμφανίζει όλες τις προτιμήσεις και τις τιμές τους"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Καταχωρεί την 'τιμή' στην τιμή του 'κλειδιού'"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "κλειδί=τιμή"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "Το 'κλειδί' είναι το όνομα της προτίμησης, ενώ 'τιμή' είναι η τιμή που του "
 "έχει προσδιοριστεί"
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Διαγράφει μια προτίμηση"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "κλειδί"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "όνομα της προτίμησης που πρόκειται να διαγραφεί"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Γράφει την τρέχουσα κατάσταση των προτιμήσεων του Gajim στο .config αρχείο"
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "εάν έχει καθοριστεί, η επαφή λαμβάνεται από την λίστα επαφών αυτού του "
 "λογαριασμού"
 
-#: gajim/gajim_remote.py:219
+#: gajim/gajim_remote.py:211
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: gajim/gajim_remote.py:226
+#: gajim/gajim_remote.py:218
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Αναφέρει τον αριθμό των μη αναγνωσμένων μηνυμάτων"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 #, fuzzy
 msgid "Sends custom XML"
 msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 #, fuzzy
 msgid "XML to send"
 msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Αλλαγή κατάστασης"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 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:257
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: gajim/gajim_remote.py:261
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Λείπει το όρισμα \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4992,31 +4987,31 @@ msgstr ""
 "Η επαφή '%s' δεν είναι στη λίστα σας.\n"
 "Παρακαλώ καθορίστε τον λογαριασμό που θα σταλεί το μήνυμα."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Ορίσματα:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "μη υπαρκτό %s"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -5027,7 +5022,7 @@ msgstr ""
 "Χρήση: %s εντολή [ορίσματα]\n"
 "Η εντολή είναι μία από τις:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -5036,7 +5031,7 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5210,7 +5205,7 @@ msgstr "Τέλος εβδομάδας"
 msgid "Weekend!"
 msgstr "Σαββατοκύριακο!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5220,62 +5215,62 @@ msgstr ""
 "σας. Χρησιμοποιήστε κάποιο εργαλείο διαχείρισης όπως το http://jru."
 "jabberstudio.org για να το αφαιρέσετε"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Νέο μονό μήνυμα από %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Νέο προσωπικό μήνυμα από το δωμάτιο %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Νέο μήνυμα από %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Νέο μήνυμα από %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "Ο %(nick)s άλλαξε κατάσταση"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Σύνδεση %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Αποσύνδεση %(nickname)s"
@@ -6310,11 +6305,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "πράσινο"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "μανάβικο"
 
@@ -6464,11 +6459,11 @@ msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να ε
 msgid "Error: cannot open %s for reading"
 msgstr "Σφάλμα: το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "κυανό"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
@@ -8177,7 +8172,7 @@ msgid "Status:"
 msgstr "Κατάσταση:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Καταγραφή ιστορικού συζητήσεων"
 
@@ -10578,6 +10573,11 @@ msgstr "Επαφές"
 msgid "Passphrase"
 msgstr "Φράση πρόσβασης"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Όνομα επαφής"
+
 #: gajim/data/gui/history_window.ui:51
 #, fuzzy
 msgid "Search:"
@@ -10591,7 +10591,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
@@ -11192,6 +11192,13 @@ msgstr "Καταγραφή ιστορικού"
 msgid "Plugin manager"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
+
+#, fuzzy
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "για το λογαριασμό %s"
@@ -11942,10 +11949,6 @@ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "έχει την προσοχή του στην κουβέντα"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Όνομα επαφής"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Ομαδικές συζητήσεις"
diff --git a/po/en_GB.po b/po/en_GB.po
index 3f39230874..aa6d65a56e 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -475,33 +475,33 @@ msgstr "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgid "Save Image as…"
 msgstr "Save Image as..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Have "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "Unknown"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "Unknown"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "Unknown"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -510,7 +510,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -519,13 +519,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, 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:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -533,15 +533,15 @@ msgid ""
 msgstr ""
 "You and the contact are interested in each other's presence information"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "There is no pending subscription request."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " resource with priority "
 
@@ -873,7 +873,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Date"
 
@@ -883,7 +883,7 @@ msgid "Nickname"
 msgstr "Nickname"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Message"
 
@@ -1196,6 +1196,11 @@ 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:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Thankful"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
@@ -1331,7 +1336,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not synchronise your contacts."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Name"
@@ -1388,27 +1393,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "New Message"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "New Single Message"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "New Private Message"
 
@@ -1441,7 +1446,7 @@ msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
@@ -1804,7 +1809,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s is now known as %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is now %(status)s"
@@ -2184,6 +2189,7 @@ msgid "_Accept"
 msgstr "Accept"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Join"
 
@@ -2203,7 +2209,7 @@ msgstr "Merged accounts"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2606,48 +2612,52 @@ msgstr "History Manager"
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Use t_rayicon (aka. notification area icon)"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Show only in _roster"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Advanced Configuration Editor"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Room Configuration"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Show All Pending _Events"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Pops up a window with the next pending event"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Database Error"
 
@@ -3239,44 +3249,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Conversation History with %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Conversation History"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Disk Error"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Error"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is now: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is now: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
@@ -3286,26 +3296,26 @@ msgstr "Subject: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Change Status Message"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "using account %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Manage Bookmarks"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "in _roster"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Show _Roster"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
@@ -3440,7 +3450,6 @@ msgid "Re_gister"
 msgstr "Re_gister"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Join"
@@ -3589,16 +3598,16 @@ msgstr "You are going to close several tabs"
 msgid "Do you really want to close them all?"
 msgstr "Do you really want to close them all?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Group Chats"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Messages"
 
@@ -3694,7 +3703,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error while sending %(message)s ( %(error)s )"
@@ -4011,37 +4020,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "default"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG key expired"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Wrong Passphrase"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
@@ -4601,65 +4610,57 @@ msgid "show help on command"
 msgstr "show help on command"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Shows or hides the roster window"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "account"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Changes the status of account or accounts"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "status"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, 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:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "message"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "status message"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4667,21 +4668,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:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Changes the priority of account or accounts"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "priority"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "priority you want to give to the account"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4689,7 +4690,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:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4699,29 +4700,29 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "message contents"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4731,119 +4732,119 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "subject"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "message subject"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sends new message to a groupchat you've joined."
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "JID of the room that will receive the message"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "file"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "File path"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "key=value"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "key"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "name of the preference to be deleted"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML to send"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4852,17 +4853,17 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Change status"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Nickname to use"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4871,19 +4872,15 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Check if Gajim is running"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Shows or hides the ipython window"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4892,15 +4889,15 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4909,16 +4906,16 @@ msgstr ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4929,7 +4926,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4938,7 +4935,7 @@ msgstr ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5112,7 +5109,7 @@ msgstr "End of week"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5121,61 +5118,61 @@ msgstr ""
 "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"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "unsubscribe request from %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Room has been destroyed"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "You can join this room instead: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unknown SSL error: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "New Single Message from %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "New Private Message from group chat %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Messaged by %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "New Message from %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Changed Status"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Signed In"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Signed Out"
@@ -6273,11 +6270,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "green"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "grocery"
 
@@ -6421,11 +6418,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -8045,7 +8042,7 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Log conversation history"
 
@@ -10333,6 +10330,11 @@ msgstr "Sent contacts:"
 msgid "Passphrase"
 msgstr "Passphrase"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Contact name"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Search:"
@@ -10345,7 +10347,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Log status changes of contacts"
@@ -10938,6 +10940,12 @@ msgstr "Recently:"
 msgid "Plugin manager"
 msgstr "Registration failed"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Shows or hides the roster window"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Shows or hides the ipython window"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP account %s@%s"
@@ -11933,10 +11941,6 @@ msgstr "Registration failed"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Invite contacts to the conversation (Ctrl+G)"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Contact name"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Groupchats"
diff --git a/po/eo.po b/po/eo.po
index 292b0ee1b3..6f998a0918 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -472,35 +472,35 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Konservi bildon kiel..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Havas "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "Nekonata"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "Nekonata"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Nekonata"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programoj</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -509,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:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -517,27 +517,27 @@ msgid ""
 msgstr ""
 "Vi interesiĝas pri kontakta ĉeesta informo, sed li/ŝi ne interesiĝas pri via"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, 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:395
+#: gajim/vcard.py:398
 #, 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:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Vi atendas respondon de kontakto pri via abona mendo"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " risurco kun prioritato "
 
@@ -877,7 +877,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Dato"
 
@@ -887,7 +887,7 @@ msgid "Nickname"
 msgstr "Kaŝnomo"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Mesaĝo"
 
@@ -1200,6 +1200,10 @@ msgstr ""
 msgid "we would like to thank all the package maintainers."
 msgstr "Fine ne malpli ol aliajn ni dankas ĉiujn pakaĵvartistojn."
 
+#: gajim/dialogs.py:1319
+msgid "Thanks"
+msgstr ""
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>"
@@ -1335,7 +1339,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nomo"
@@ -1394,27 +1398,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "En ambaÅ­ kampoj la pasvortoj devas esti identaj."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Kontakto ensalutis"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Kontakto elsalutis"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Nova mesaĝo"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Nova unuobla mesaĝo"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Nova privata mesaĝo"
 
@@ -1447,7 +1451,7 @@ msgid "Groupchat Invitation"
 msgstr "Babileja invitilo"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Kontakto ŝanĝis sian staton"
 
@@ -1813,7 +1817,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s nomiĝas %s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
@@ -2190,6 +2194,7 @@ msgid "_Accept"
 msgstr "Akcepti"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Aliĝi"
 
@@ -2211,7 +2216,7 @@ msgstr "Unuigaj kontoj"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 #, fuzzy
@@ -2616,48 +2621,52 @@ msgstr "Historia administrilo"
 msgid "_Join New Group Chat"
 msgstr "_Eniri babilejen"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Uzi pletpiktogramon"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Montri nur en _kontaktlisto"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Detala agorda administrilo"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Agordo de babilejo"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Montri ĉiujn nelegitajn _eventojn"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "AntaÅ­igas fenestron kun la sekva atendanta evento"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
@@ -3252,44 +3261,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historio de interparolo kun %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Historio de interparoloj"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stato nun estas: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stato nun estas: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temo: %s\n"
@@ -3299,26 +3308,26 @@ msgstr "Temo: %s\n"
 msgid "_Change Status Message…"
 msgstr "Ŝanĝi stat_mesaĝon"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "per konto %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Aranĝi legosignojn"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Mankas en kontaktlisto"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Montri _kontaktliston"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Kaŝi tiun ĉi menuon"
 
@@ -3454,7 +3463,6 @@ msgid "Re_gister"
 msgstr "Re_gistri"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Aliĝi"
@@ -3610,16 +3618,16 @@ msgstr "Vi nekonektitas al la servilo"
 msgid "Do you really want to close them all?"
 msgstr "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Babilejoj"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Privataj interparoloj"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Mesaĝoj"
 
@@ -3714,7 +3722,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "eraro dum sendado %s ( %s )"
@@ -4004,38 +4012,38 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Ne povis konservi vian agordon"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 #, fuzzy
 msgid "default"
 msgstr "DefaÅ­lte"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Pasfrazo necesas"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Malprava pasfrazo"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Bonvolu ripeti vian GPG-pasvorton aÅ­ klaku Nuligi."
@@ -4597,48 +4605,40 @@ msgid "show help on command"
 msgstr "montri helpon pri komando"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "konto"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "Montri kontaktojn nur de specifita konto"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Eligas liston de registritaj kontoj"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "stato"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4646,17 +4646,17 @@ msgid ""
 msgstr ""
 "unu el: senkonekta, enrete, babilas, fora, nedisponebla, okupata, nevidebla "
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "mesaĝo"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "statmesaĝo"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4665,22 +4665,22 @@ msgstr ""
 "statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
 "komuna stato\""
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "Priori_tato:"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Mi volas registri novan konton"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4690,7 +4690,7 @@ msgstr ""
 "statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
 "komuna stato\""
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4700,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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "mesaĝenhavo"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4732,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:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "temo"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "temo de mesaĝo"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Ricevas detalan informon pri kontakto"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID de la kontakto"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Ricevas detalan informon pri konto"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Nomo de la konto"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Sendi dosieron al kontakto"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "dosiero"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Dosierindiko"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "Se specifita, dosiero estos sendita per tiu ĉi konto"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Listo de ĉiuj parametroj kaj ilia valoroj"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Valorigi \"ŝlosilo\" per \"valoro\"."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "ŝlosilo=valoro"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Forigas parametron"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "ŝlosilo"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "nomo de forigota parametro"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Donas kvanton de nelegitaj mesaĝoj"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Sendi propran XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML por sendi"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4853,17 +4853,17 @@ msgstr ""
 "Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
 "kontoj"
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Kaŝnomo ne trovitas: %s"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4872,21 +4872,16 @@ msgstr ""
 "Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
 "kontoj"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: 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:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Mankas argumento \"kontakt-jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4895,31 +4890,31 @@ msgstr ""
 "%s mankas en via kontaktlisto\n"
 "Bonvolu specifi konton por sendi la mesaĝon."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Vi ne havas aktivan konton"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Argumentoj:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s ne trovitas"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4930,7 +4925,7 @@ msgstr ""
 "Uzado: %s komando [argumentoj]\n"
 "Komando estas unu el:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4939,7 +4934,7 @@ msgstr ""
 "Tro multe da argumentoj. \n"
 "Enigu \"%s help %s\" por plia informo"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5113,7 +5108,7 @@ msgstr "Fino de semajno"
 msgid "Weekend!"
 msgstr "Semajnofino!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5122,62 +5117,62 @@ msgstr ""
 "JID %s ne estas norma laÅ­ la RFC. Äœi ne aldonitos al via kontaktlisto. Uzu "
 "kontaktlistan agordan ilon kiel http://jru.jabberstudio.org/ por forigi ĝin"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "ordono pri abona fino de %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Permeso estas forigita"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova unuopa mesaĝo de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova privata mesaĝo de babilejo %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova mesaĝo de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova mesaĝo de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ŝanĝis staton"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s ensalutis"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s elsalutis"
@@ -6240,11 +6235,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "verda"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "manĝbutiko"
 
@@ -6400,11 +6395,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "blua"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "indeksigas protokolan datumbazon"
 
@@ -8101,7 +8096,7 @@ msgid "Status:"
 msgstr "Stato:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Protokoli komunikadan historion"
 
@@ -10472,6 +10467,11 @@ msgstr "Kontaktoj"
 msgid "Passphrase"
 msgstr "Pasfrazo"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Kontaktnomo"
+
 #: gajim/data/gui/history_window.ui:51
 #, fuzzy
 msgid "Search:"
@@ -10485,7 +10485,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Protokoli statŝanĝojn de kontaktoj"
@@ -11084,6 +11084,13 @@ msgstr "AntaÅ­ nelonge:"
 msgid "Plugin manager"
 msgstr "Konektado malsukcesis"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
+
+#, fuzzy
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "de konto %s"
@@ -11834,10 +11841,6 @@ msgstr "Konektado malsukcesis"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "atentas al la komunikado"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Kontaktnomo"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Babilejoj"
diff --git a/po/es.po b/po/es.po
index f537975d6f..d4cb4f19de 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -480,33 +480,33 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Guardar imagen como..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Tiene "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "Desconocido"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "Desconocido"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "Desconocida"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Afiliación:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -515,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:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -524,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:393
+#: gajim/vcard.py:396
 #, 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:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -540,16 +540,16 @@ msgstr ""
 "Tanto tú como el contacto estáis interesados en la información de la "
 "presencia del otro"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "No hay ninguna suscripción pendiente."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
@@ -882,7 +882,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Fecha"
 
@@ -892,7 +892,7 @@ msgid "Nickname"
 msgstr "Alias"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Mensaje"
 
@@ -1207,6 +1207,11 @@ msgstr ""
 "Por último pero no menos importante, queremos agradecer a todos los "
 "mantenedores de paquetes."
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Agradecido"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Fran Alburquerque <frank@giingo.org>"
@@ -1342,7 +1347,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sin una conexión, no puedes sincronizar tus contactos."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nombre"
@@ -1399,27 +1404,27 @@ 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:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Nuevo mensaje"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Nuevo mensaje privado"
 
@@ -1452,7 +1457,7 @@ msgid "Groupchat Invitation"
 msgstr "Invitación a grupo de charla"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Contacto cambió su estado"
 
@@ -1814,7 +1819,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s ahora es conocido como %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está ahora %(status)s"
@@ -2199,6 +2204,7 @@ msgid "_Accept"
 msgstr "Aceptar"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -2218,7 +2224,7 @@ msgstr "Cuentas combinadas"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2616,48 +2622,52 @@ msgstr "Histórico"
 msgid "_Join New Group Chat"
 msgstr "_Entrar en nuevo grupo de charla"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Usar icono en el á_rea de notificación"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Sólo mostrar en la _lista de contactos"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor avanzado de configurción"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Configuración del salón"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Mostrar todos los _eventos pendientes"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Levanta una venana con el siguiente evento pendiente"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Error en la base de datos"
 
@@ -3252,45 +3262,45 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de conversaciones con %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Histórico de conversaciones"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Error de disco"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Mensaje de error: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 #, fuzzy
 msgid "Error"
 msgstr "Error."
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, 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:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -3300,26 +3310,26 @@ msgstr "Tema: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Cambiar mensaje de estado"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "usando la cuenta %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Gestionar marcadores"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "en _roster"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Mostrar _roster"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Oculta este menú"
 
@@ -3454,7 +3464,6 @@ msgid "Re_gister"
 msgstr "_Suscribir"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Entrar"
@@ -3603,16 +3612,16 @@ msgstr "Estás a punto de cerrar varias pestañas"
 msgid "Do you really want to close them all?"
 msgstr "¿Realmente quieres cerrarlas todas?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Grupos de charla"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Conversaciones privadas"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Mensajes"
 
@@ -3708,7 +3717,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error mientras se enviaba %(message)s ( %(error)s )"
@@ -4026,38 +4035,38 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "por defecto"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Contraseña requerida"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "La clave GPG expiró"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Contraseña equivocada"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Por favor, vuelve a escribir tu contraseña GPG o presiona Cancelar."
@@ -4626,48 +4635,40 @@ msgid "show help on command"
 msgstr "mostrar ayuda sobre un comando"
 
 #: 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:93
-msgid "Pops up a window with the next pending event"
-msgstr "Levanta una venana con el siguiente evento pendiente"
-
-#: 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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "cuenta"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "mostrar sólo contactos de la cuenta especificada"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Muestra una lista de cuentas registradas"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Cambia el estado de una o varias cuentas"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "estado"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4676,17 +4677,17 @@ msgstr ""
 "uno de: desconectado, en línea, libre para hablar, ausente, no disponible, "
 "ocupado, invisible"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "mensaje"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "ensaje de estado"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4695,22 +4696,22 @@ msgstr ""
 "cambiar el estado de todas las cuentas que tienen la opción \"sync with "
 "global status\" activada"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Cambia el estado de una o varias cuentas"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "Pr_ioridad:"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Quiero _registrar una nueva cuenta de Jabber"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4720,7 +4721,7 @@ msgstr ""
 "cambiar el estado de todas las cuentas que tienen la opción \"sync with "
 "global status\" activada"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4730,29 +4731,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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "la JID del contacto que recibirá el mensaje"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "contenido del mensaje"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4762,123 +4763,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:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "tema"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "tema del mensaje"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 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:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "La JID del salón que recibirá el mensaje"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Obtener información detallada de un contacto"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID del contacto"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Obtener información detallada de una cuenta"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Nombre de la cuenta"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Enviar archivo a un contacto"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "archivo"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Ruta del archivo"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 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:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Lista todas las preferencias y sus valores"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define el valor de 'entrada' a 'valor'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "entrada"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "nombre de la preferencia a eliminar"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Elimina contacto del roster"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Devuelve el número de mensajes sin leer"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML a enviar"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4887,17 +4888,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:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Cambiar estado"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Alias a usar"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4906,19 +4907,15 @@ 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:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Comprueba si Gajim se encuentra en ejecución"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Muestra u oculta la ventana ipython"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "No se encuentra el argumento \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4927,15 +4924,15 @@ msgstr ""
 "'%s' no está en tu lista de contactos.\n"
 "Por favor, especifica una cuenta para enviar el mensaje."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "No tienes cuentas activas"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4944,16 +4941,16 @@ msgstr ""
 "Uso: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s no encontrado"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4964,7 +4961,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando es uno de:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4973,7 +4970,7 @@ msgstr ""
 "Demasiados argumentos. \n"
 "Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5147,7 +5144,7 @@ msgstr "Final de semana"
 msgid "Weekend!"
 msgstr "¡Fin de semana!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5157,61 +5154,61 @@ msgstr ""
 "herramientas de gestión del roster como http://jru.jabberstudio.org/ para "
 "eliminarlo"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "petición de eliminación de suscripción de %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "El salón ha sido destruido"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 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:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Error SSL desconocido: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuevo mensaje de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, 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:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Enviado por %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuevo mensaje de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambió su estado"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se ha conectado"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se ha desconectado"
@@ -6334,11 +6331,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sonido a reproducir cuando llega cualquier mensaje MUC"
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "verde"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "grocery"
 
@@ -6482,11 +6479,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "migrando la base de datos de registros a los índices"
 
@@ -8111,7 +8108,7 @@ msgid "Status:"
 msgstr "Estado:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "Histórico de conversaciones"
 
@@ -10421,6 +10418,11 @@ msgstr "Contactos enviados:"
 msgid "Passphrase"
 msgstr "Contraseña"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Nombre de contacto"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Buscar"
@@ -10433,7 +10435,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Registrar cambios de estado de los contactos"
@@ -11027,6 +11029,12 @@ msgstr "Histórico"
 msgid "Plugin manager"
 msgstr "Falló el registro"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Muestra u oculta la ventana de la lista de contactos"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Muestra u oculta la ventana ipython"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "Cuenta XMPP %s@%s"
@@ -12185,10 +12193,6 @@ msgstr "Falló el registro"
 #~ msgid "All Chat Histories"
 #~ msgstr "Historias viejas"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Nombre de contacto"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Grupos de charla"
diff --git a/po/eu.po b/po/eu.po
index 95fe930934..0aed5fe717 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -474,35 +474,35 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Gorde Irudia Bezala..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "daukadanean"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "Aurkitu gabea"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "Aurkitu gabea"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Aurkitu gabea"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikazioak</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -511,7 +511,7 @@ msgstr ""
 "Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude "
 "haren egoera informazioan interesatuta"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -520,28 +520,28 @@ msgstr ""
 "Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan "
 "interesik"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Zu eta kontaktua, bien egoera informazioetan interesatuta zaudete"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 #, 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:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr "baliabidea lehentasunarekin: "
 
@@ -881,7 +881,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Data"
 
@@ -891,7 +891,7 @@ msgid "Nickname"
 msgstr "Izengoitia"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Mezua"
 
@@ -1208,6 +1208,10 @@ msgstr ""
 "Azkenak baina ez gutxien merezitakoak,\n"
 "eskerrak eman nahi dzkiegu paketeak mantentzen dituztenei."
 
+#: gajim/dialogs.py:1319
+msgid "Thanks"
+msgstr ""
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Urtzi Alfaro <urtzi@altza.net>"
@@ -1343,7 +1347,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Izena"
@@ -1402,27 +1406,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Bi lekuetan pasahitza berdina izan behar du."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Kontaktua konektatuta"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Mezu Berria Bat"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Mezu Berri Bat"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Mezu Pribatu Berri Bat"
 
@@ -1455,7 +1459,7 @@ msgid "Groupchat Invitation"
 msgstr "Txat Taldeko Gonbidapena"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Kontaktu Egoera Aldaketa"
 
@@ -1822,7 +1826,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s orain %s bezala ezaguna da"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
@@ -2199,6 +2203,7 @@ msgid "_Accept"
 msgstr "Onartu"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Sartu"
 
@@ -2220,7 +2225,7 @@ msgstr "Batu kontuak"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 #, fuzzy
@@ -2629,48 +2634,53 @@ msgstr "Historial Administratzailea"
 msgid "_Join New Group Chat"
 msgstr "T_xat Talde Berrian Sartu"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "E_rabili ikonifikazioa (aka. notification area)"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Ikusi _zerrendan bakarrik"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Konfigurazio Aurreratuaren Editorea"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Gelaren Konfigurazioa"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Ikusi Gabeko _Gertaerak"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+#, fuzzy
+msgid "Pops up a window with the next pending event"
+msgstr "Agertarazi leiho bat hurrengo irakurri gabeko gertaerarekin"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
@@ -3270,44 +3280,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Elkarrizketa Historiala %s-rekin"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Elkarrizketaren Historiala"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Errore mezua: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Egoera orain da: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Egoera orain da: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
@@ -3317,26 +3327,26 @@ msgstr "Gaia: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Egoera Mezua aldatu"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "%s kontua erabiliz "
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Talde Agenda Moldatu"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Ez dago zerrendan"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Ikusi _Zerrenda"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Ezkutatu Menua"
 
@@ -3472,7 +3482,6 @@ msgid "Re_gister"
 msgstr "Erre_gistratu"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Sartu"
@@ -3626,16 +3635,16 @@ msgstr "Ez zaude zerbitzarira konektatuta"
 msgid "Do you really want to close them all?"
 msgstr "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Txat Taldeak"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Txat Pribatuak"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Mezuak"
 
@@ -3730,7 +3739,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errorea bidaltzen zen bitartean %s ( %s )"
@@ -4023,38 +4032,38 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 #, fuzzy
 msgid "default"
 msgstr "Berezkoa"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Pasa-esaldia Behar da"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "OpenPGP Giltzaren Aukera"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Pasa-esaldi okerra"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
@@ -4618,66 +4627,57 @@ msgid "show help on command"
 msgstr "show help on command"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "kontua"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "Ikusi emandako kontaktuak bakarrik"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Inprimatu erregistratutako kontuen lista"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "egoera"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, 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:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "mezua"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "egoera mezua"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4686,22 +4686,22 @@ msgstr ""
 "\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
 "egoera aldatzen"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "Lehentas_una:"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Kontu berri bat _erregistratu nahi dut"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4711,7 +4711,7 @@ msgstr ""
 "\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
 "egoera aldatzen"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4721,29 +4721,29 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "mezuaren edukia"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr "hautatua badago, mezua kontu hau erabiliz bidaliko da"
 
-#: gajim/gajim_remote.py:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4753,121 +4753,121 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "gaia"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "mezuaren gaia"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "Kontaktuaren JID-a"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Kontuaren izena"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Fitxero bat bidali kontaktu bati"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "fitxeroa"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Fitxeroaren tokia"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "Hautatua badago, fitxero hau kontu hau erabiliz bidaliko da"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Erakutsi preferentzia eta balio guztiak"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "key=value"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Preferentziako aukera ezabatu"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "giltza"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "preferentziaren izena borratzeko"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Irakurri gabeko mezuen kontaketa itzuli"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr " XML bidaltzeko"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4875,17 +4875,17 @@ msgid ""
 msgstr ""
 "Xml-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da"
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Izengoitia aurkitugabea: %s"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4893,21 +4893,16 @@ msgid ""
 msgstr ""
 "Xml-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
 
-#: gajim/gajim_remote.py:261
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Galdutako argumentua  \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4916,31 +4911,31 @@ msgstr ""
 "'%s'  ez dago zure zerrendan.\n"
 "Kontua zehaztu mezua bidaltzeko."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Ez duzu aktibatutako konturik"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Argumentuak:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s ez da aurkitu"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4951,7 +4946,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4960,7 +4955,7 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5134,7 +5129,7 @@ msgstr "Aste bukaera"
 msgid "Weekend!"
 msgstr "Asteburua!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5143,62 +5138,62 @@ msgstr ""
 "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"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Harpidetza kentzekoa eskaera %s -tik"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Mezu Pribatu Berri Bat %s gelatik"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Egoera Aldatu du"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Konektatuta"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Deskonektatuta"
@@ -6253,11 +6248,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Soinu bat ezarri MUC-eko edozein mezu iristean."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "berdea"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "grocery"
 
@@ -6413,11 +6408,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indeces"
@@ -8115,7 +8110,7 @@ msgid "Status:"
 msgstr "Egoera:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "Elkarrizketaren _historiala"
 
@@ -10493,6 +10488,11 @@ msgstr "Kontaktua"
 msgid "Passphrase"
 msgstr "Pasa-esaldia"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Kontaturen izena"
+
 #: gajim/data/gui/history_window.ui:51
 #, fuzzy
 msgid "Search:"
@@ -10506,7 +10506,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "Kontaktuen egoera aldaketak gorde"
@@ -11103,6 +11103,13 @@ msgstr "Berriki:"
 msgid "Plugin manager"
 msgstr "Konexioak huts egin du"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
+
+#, fuzzy
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "%s kontukoa"
@@ -11870,10 +11877,6 @@ msgstr "Konexioak huts egin du"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "arreta jartzen ari da elkarrizketara"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Kontaturen izena"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Txat Taldeak"
diff --git a/po/fr.po b/po/fr.po
index 496e2478eb..a79864b74a 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -478,39 +478,39 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Enregistrer l'image sous…"
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 msgid "Save _As"
 msgstr "Enregistrer _sous"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "Inconnu"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "Inconnu"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Date:Inconnue"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "<b>Role :</b>"
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation :</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 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:391
+#: gajim/vcard.py:394
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
@@ -518,26 +518,26 @@ msgstr ""
 "Vous vous intéressez à l'état de ce contact, mais il ne s'intéresse pas au "
 "vôtre"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 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:395
+#: gajim/vcard.py:398
 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:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Il n'y a aucune requête d'inscription en attente."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
@@ -833,7 +833,7 @@ msgid "JID"
 msgstr "Identifiant Jabber"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Date"
 
@@ -843,7 +843,7 @@ msgid "Nickname"
 msgstr "Pseudonyme"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Message"
 
@@ -1142,6 +1142,11 @@ msgstr "Enfin et surtout"
 msgid "we would like to thank all the package maintainers."
 msgstr "nous voulons remercier tous les mainteneurs de paquet."
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Reconnaissant(e)"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1279,7 +1284,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sans connexion, vous ne pouvez pas synchroniser vos contacts."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nom"
@@ -1334,27 +1339,27 @@ 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:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Nouveau message"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Nouveau message simple"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
@@ -1387,7 +1392,7 @@ msgid "Groupchat Invitation"
 msgstr "Invitation à un salon"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Le contact a changé d'état"
 
@@ -1760,7 +1765,7 @@ 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:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s est maintenant %(status)s"
@@ -2128,6 +2133,7 @@ msgid "_Accept"
 msgstr "_Accepter"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "Re_joindre"
 
@@ -2147,7 +2153,7 @@ msgstr "Comptes regroupés"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2553,45 +2559,50 @@ msgstr "Gestionnaire d'historique"
 msgid "_Join New Group Chat"
 msgstr "_Joindre un salon de discussion"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 msgid "Show the application's version"
 msgstr "Afficher la version de l'application"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 msgid "Show only critical errors"
 msgstr "Ne montrer que les erreurs critiques"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 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:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr "Affiche le flux XML et autres informations de débogage"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 msgid "Use defined profile in configuration directory"
 msgstr "Utilise un profil défini dans le dossier de configuration"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 msgid "Set configuration directory"
 msgstr "Fixe le répertoire de configuration"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr "Configurer le système de log"
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 msgid "Show all warnings"
 msgstr "Afficher tous les avertissements"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+#, fuzzy
+msgid "Open IPython shell"
 msgstr "ouvrir un shell ipython"
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Afficher une fenêtre avec le prochain message non lu"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Erreur de base de données"
 
@@ -3185,44 +3196,44 @@ msgstr "La machine se met en veille"
 msgid "Disconnect from the network"
 msgstr "Déconnecté du réseau"
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historique de conversation avec %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Historique de conversation"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Erreur du disque"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Erreur : %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Erreur"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, 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:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "L'état est maintenant : %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
@@ -3231,24 +3242,24 @@ msgstr "Sujet : %s\n"
 msgid "_Change Status Message…"
 msgstr "_Changer le message d'état…"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "du compte %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 msgid "_Manage Bookmarks…"
 msgstr "_Gérer les marque-pages…"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
 msgstr "Cacher la liste de contacts"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Montrer la _liste de contacts"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Cacher ce menu"
 
@@ -3379,7 +3390,6 @@ msgid "Re_gister"
 msgstr "_Souscrire"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "Join"
 msgstr "Rejoindre"
 
@@ -3531,15 +3541,15 @@ msgstr "Vous êtes sur le point de fermer plusieurs onglets"
 msgid "Do you really want to close them all?"
 msgstr "Voulez-vous vraiment tous les fermer ?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 msgid "?Noun:Chats"
 msgstr "Discussions"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Conversations privées"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Messages"
 
@@ -3635,7 +3645,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Erreur %(code)s : %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erreur en envoyant %(message)s ( %(error)s )"
@@ -3953,37 +3963,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Impossible d'enregistrer vos informations de configuration"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "Par défaut"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 msgid "OpenPGP key expired"
 msgstr "Clef OpenPGP expirée"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Mot de passe erroné"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Veuillez ressaisir votre mot de passe OpenPGP ou appuyez sur Annuler."
 
@@ -4516,42 +4526,34 @@ msgid "show help on command"
 msgstr "montrer l'aide sur la commande"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Montre ou cache la fenêtre principale"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 msgid "?CLI:account"
 msgstr "compte"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "montrer seulement les contacts du compte spécifié"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Affiche la liste des comptes enregistrés"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 msgid "Changes the status of account(s)"
 msgstr "Change l'état du ou des compte(s)"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid "?CLI:status"
 msgstr "état"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4559,16 +4561,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:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 msgid "?CLI:message"
 msgstr "message"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "Message d'état"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4577,19 +4579,19 @@ msgstr ""
 "changer l'état de tous les compte qui ont l'option \"synchroniser avec "
 "l'état global\" activée"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 msgid "Changes the priority of account(s)"
 msgstr "Change la priorité du ou des compte(s)"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "?CLI:priority"
 msgstr "Priorité"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "priorité que vous voulez donner au compte"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4598,7 +4600,7 @@ msgstr ""
 "change la priorité de tous les comptes qui ont l'option « synchroniser avec "
 "l'état global » activée"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4608,29 +4610,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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "L'identifiant Jabber du contact qui recevra le message"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "contenu du message"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr "Clé PGP"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 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 \"\"."
@@ -4639,119 +4641,119 @@ msgstr ""
 "sont facultatifs. Si vous voulez seulement renseigner le dernier paramètre, "
 "mettez simplement \"\" pour 'clé PGP'."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "sujet"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "sujet du message"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 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:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "L'identifiant Jabber du salon qui recevra le message"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Récupère les informations détaillées d'un contact"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "L'identifiant Jabber du contact"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Récupère les informations détaillées d'un compte"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Nom du compte"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Envoyer un fichier à un contact"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "fichier"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Chemin du fichier"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 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:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Liste toutes les préférences et leurs valeurs"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Définir la valeur de 'clé' à 'valeur'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Supprime une option de préférence"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "touche"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "nom de la préférence a supprimer"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Enlever le contact de la liste"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Renvoie le nombre de messages non-lus"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Envoyer du XML personnalisé"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML à envoyer"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
@@ -4759,15 +4761,15 @@ msgstr ""
 "Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé "
 "à tous les comptes"
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr "Modifier l'avatar"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr "Image à utiliser"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4775,19 +4777,15 @@ msgstr ""
 "Compte dans lequel l'avatar sera envoyé ; si non spécifié, l'avatar sera "
 "envoyé à tous les comptes"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Vérifie si Gajim est lancé"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Montre ou cache la fenêtre ipython"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument manquant \"jid_contact\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4796,17 +4794,17 @@ msgstr ""
 "'%s' n'est pas dans votre liste de contact.\n"
 "Précisez le compte pour envoyer le message."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Vous n'avez aucun compte actif"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4815,16 +4813,16 @@ msgstr ""
 "Utilisation : %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s non trouvé"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4837,7 +4835,7 @@ msgstr ""
 "\n"
 "commande est l'une de :\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4846,7 +4844,7 @@ msgstr ""
 "Trop d'arguments.\n"
 "Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5020,7 +5018,7 @@ msgstr "Fin de la semaine"
 msgid "Weekend!"
 msgstr "Fin de semaine !"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5030,61 +5028,61 @@ msgstr ""
 "à votre liste de contacts. Utilisez un outil de gestion de liste de contact "
 "tel que http://jru.jabberstudio.org/ pour le supprimer"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Le salon de discussion a été détruit"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Vous pouvez rejoindre le salon %s à la place"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erreur SSL inconnue : %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nouveau message simple de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nouveau message privé dans le salon %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Message de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nouveau message de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a changé d'état"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s s'est connecté(e)"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s s'est déconnecté(e)"
@@ -6269,11 +6267,11 @@ msgstr ""
 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:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "vert"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "épicerie"
 
@@ -6414,11 +6412,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "migration de la base de données de l'historique vers des index"
 
@@ -8043,7 +8041,7 @@ msgid "Status:"
 msgstr "État :"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Historique de conversation"
 
@@ -10238,6 +10236,10 @@ msgstr "Supprimer le contact"
 msgid "Passphrase"
 msgstr "Mot de passe"
 
+#: gajim/data/gui/history_window.ui:38
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Entrer le nom / JID du contact ou du salon"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Chercher :"
@@ -10250,7 +10252,7 @@ msgstr "Chercher à cette date"
 msgid "Only searching within selected day"
 msgstr "Cherche uniquement à la date sélectionnée"
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 msgid "_Show status changes"
 msgstr "_Afficher les modifications d'état"
 
@@ -10856,6 +10858,12 @@ msgstr "Historique des discussions"
 msgid "Plugin manager"
 msgstr "Gestionnaire de plugins"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Montre ou cache la fenêtre principale"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Montre ou cache la fenêtre ipython"
+
 #~ msgid "XMPP account %s"
 #~ msgstr "Compte XMPP %s"
 
diff --git a/po/gl.po b/po/gl.po
index eb09c36f03..dce0edbcd4 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -477,35 +477,35 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Gardar a imaxe como..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Ten "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "Descoñecido"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "Descoñecido"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Descoñecido"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programas</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -514,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:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -523,14 +523,14 @@ msgstr ""
 "Está interesado na información da presenza do contacto, mais el/ela non o "
 "está en vostede"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, 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:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -539,16 +539,16 @@ msgstr ""
 "Tanto vostede como o contacto están interesados na información da presenza "
 "do outro"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " recurso con prioridade "
 
@@ -888,7 +888,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Data"
 
@@ -898,7 +898,7 @@ msgid "Nickname"
 msgstr "Alcume"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Mensaxe"
 
@@ -1218,6 +1218,10 @@ msgstr ""
 "Por último mais non menos importante, queremos agradecerlles a todos os "
 "mantedores de paquetes."
 
+#: gajim/dialogs.py:1319
+msgid "Thanks"
+msgstr ""
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Fran Alburquerque <membriskhan@gmail.com>"
@@ -1354,7 +1358,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nome"
@@ -1413,27 +1417,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Os contrasinais escritos nos dous campos deben ser idénticos."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Mensaxe nova"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Mensaxe nova"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Mensaxe privada nova"
 
@@ -1466,7 +1470,7 @@ msgid "Groupchat Invitation"
 msgstr "Convite a grupo de charla"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Un contacto cambiou o seu estado"
 
@@ -1834,7 +1838,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s coñéceselle como %s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
@@ -2213,6 +2217,7 @@ msgid "_Accept"
 msgstr "Aceptar"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -2234,7 +2239,7 @@ msgstr "Contas combinadas"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 #, fuzzy
@@ -2643,48 +2648,53 @@ msgstr "Historial"
 msgid "_Join New Group Chat"
 msgstr "_Entrar nun outro grupo de charla"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Usar a icona na á_rea de notificación"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Amosar só na _listaxe de contactos"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor avanzado de configuración"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Configuración da sala"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Amosar todos os _eventos pendentes"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+#, fuzzy
+msgid "Pops up a window with the next pending event"
+msgstr "Amosa unha fiestra emerxente co seguinte acontecemento pendente"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
@@ -3285,44 +3295,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historial de conversas con %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Historial de conversas"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s "
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "O estado é agora: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Asunto: %s\n"
@@ -3332,26 +3342,26 @@ msgstr "Asunto: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Cambiar a mensaxe de estado"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "a usar a conta %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Xestionar os marcadores"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Non está na listaxe"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Amosar _listaxe"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Ocultar este menú"
 
@@ -3487,7 +3497,6 @@ msgid "Re_gister"
 msgstr "_Subscribir"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Entrar"
@@ -3643,16 +3652,16 @@ msgstr "Non está conectado ao servidor"
 msgid "Do you really want to close them all?"
 msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Grupos de charla"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Charlas privadas"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Mensaxes"
 
@@ -3748,7 +3757,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "produciuse un erro mentres se enviaba %s ( %s )"
@@ -4038,38 +4047,38 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Non se poden gardar as preferencias"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 #, fuzzy
 msgid "default"
 msgstr "Por defecto"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "É necesario o contrasinal"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Selección da chave de OpenPGP"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "O contrasinal é incorrecto"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Por favor, volva escribir o seu contrasinal de GPG ou prema Cancelar."
@@ -4633,49 +4642,40 @@ msgid "show help on command"
 msgstr "amosar axuda sobre un comando"
 
 #: 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: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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "conta"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "amosar só contactos da conta especificada"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Amosa unha listaxe de contas que están rexistradas"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Cambia o estado dunha ou de varias contas"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "estado"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4684,17 +4684,17 @@ msgstr ""
 "un de: desconectado, en liña, libre para falar, ausente, non dispoñíbel, "
 "ocupado, invisíbel"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "mensaxe"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "mensaxe de estado"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4703,22 +4703,22 @@ msgstr ""
 "o estado de todas as contas que teñen a opción \"sync with global status\" "
 "activada"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Cambia o estado dunha ou de varias contas"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "Pr_ioridade:"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Quero _rexistrar unha conta nova de Jabber"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4728,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:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4738,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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "contido da mensaxe"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4770,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:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "tema"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "tema da mensaxe"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Obter información detallada dun contacto"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Obter información detallada dunha conta"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Enviarlle un ficheiro a un contacto"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "ficheiro"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Camiño do ficheiro"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "se se especifica, o ficheiro enviarase mediante esta conta"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Nomea todas as preferencias e os seus valores"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'entrada' a 'valor'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "entrada"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "nome da preferencia para eliminar"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Elimina o contacto da listaxe"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Devolve o número de mensaxes sen ler"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML para enviar"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4897,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:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Un contacto cambiou o seu estado"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Non se achou o alcume: %s"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4916,21 +4916,16 @@ msgstr ""
 "Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
 "a todas as contas"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Por favor, comprobe se o avahi-daemon está en execución."
 
-#: 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:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Non se atopa o argumento \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4939,31 +4934,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:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Non ten contas activas"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "Non se encontrou %s"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4974,7 +4969,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando é un de:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4983,7 +4978,7 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5157,7 +5152,7 @@ msgstr "Final de semana"
 msgid "Weekend!"
 msgstr "Fin de semana!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5167,62 +5162,62 @@ msgstr ""
 "contactos. Use as ferramentas de xestión de listaxe de contactos roster como "
 "http://jru.jabberstudio.org/ para o eliminar"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "solicitude de eliminación de subscrición de %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Eliminouse a autorización"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, 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:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambiou o seu estado"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s conectouse"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s desconectouse"
@@ -6293,11 +6288,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Son para reproducir cando chega calquera mensaxe MUC"
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "verde"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "ultramariño"
 
@@ -6453,11 +6448,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "ciano"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrando os rexistros da base de datos aos índices"
@@ -8154,7 +8149,7 @@ msgid "Status:"
 msgstr "Estado:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "Historial de conversas"
 
@@ -10537,6 +10532,11 @@ msgstr "Contactos"
 msgid "Passphrase"
 msgstr "Contrasinal"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Nome de contacto"
+
 #: gajim/data/gui/history_window.ui:51
 #, fuzzy
 msgid "Search:"
@@ -10550,7 +10550,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Rexistrar os cambios de estado dos contactos"
@@ -11145,6 +11145,13 @@ msgstr "Recentemente:"
 msgid "Plugin manager"
 msgstr "Fallou a conexión"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
+
+#, fuzzy
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "da conta %s"
@@ -11906,10 +11913,6 @@ msgstr "Fallou a conexión"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "está a prestar atención á conversa"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Nome de contacto"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Grupos de charla"
diff --git a/po/he.po b/po/he.po
index 8d98111ba7..93c8c0863b 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -502,30 +502,30 @@ msgstr "אין אפשרות לשמור תמונה בפורמט %(type)s. לשמ
 msgid "Save Image as…"
 msgstr "שמירת תמונה בשם..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "נשמר בתוך: ‎%s"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "לא ידוע"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "לא ידועה"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "לא ידוע"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "<b>תפקיד:</b>"
 
 # שיוך, סיפוח
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>השתייכות:</b>"
 
@@ -533,7 +533,7 @@ msgstr "<b>השתייכות:</b>"
 # BUG:?
 # interested at his/her presence
 # interested in his/her presence information
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -541,7 +541,7 @@ msgid ""
 msgstr ""
 "איש קשר זה מעוניין במידע נוכחותך, אולם אין לך עניין בנוכחותו של איש קשר זה"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -551,28 +551,28 @@ msgstr ""
 "בנוכחותך"
 
 # אחד את השני
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "הינך וגם איש הקשר מעוניינים במידע הנוכחות של זה את זה"
 
 # אחד את השני
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "הינך וגם איש הקשר מעוניינים במידע הנוכחות של זה את זה"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "הינך מחכה למענה איש קשר בנוגע לבקשת רישומך"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "לא קיימת שום בקשת הרשמה ממתינה."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " משאב עם עדיפות "
 
@@ -909,7 +909,7 @@ msgid "JID"
 msgstr "‏JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "תאריך"
 
@@ -919,7 +919,7 @@ msgid "Nickname"
 msgstr "שם כינוי"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "הודעה"
 
@@ -1229,6 +1229,12 @@ msgstr ""
 msgid "we would like to thank all the package maintainers."
 msgstr "‎.ואחרון אחרון חביב, ברצוננו להודות לכל מתחזקי החבילות"
 
+# מביע הערכה, מביע תודה
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "אסיר תודה"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1378,7 +1384,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "ללא חיבור, אין באפשרותך לסנכרן את אנשי הקשר שלך."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "שם"
@@ -1442,27 +1448,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "הסיסמאות אשר מוקלדות בשני השדות מוכרחות להיות זהות."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "איש קשר התחבר"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "איש קשר התנתק"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "הודעה חדשה"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "הודעה בודדת חדשה"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "הודעה פרטית חדשה"
 
@@ -1495,7 +1501,7 @@ msgid "Groupchat Invitation"
 msgstr "הזמנת שיחת קבוצה"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "איש קשר שינה מצב"
 
@@ -1888,7 +1894,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s ידוע/ה כעת בתור %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s מצוי/ה כעת במצב %(status)s "
@@ -2283,6 +2289,7 @@ msgid "_Accept"
 msgstr "_קבל"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "ה_צטרף"
 
@@ -2302,7 +2309,7 @@ msgstr "חשבונות ממוזגים"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2709,50 +2716,55 @@ msgstr "מנהל היסטוריה"
 msgid "_Join New Group Chat"
 msgstr "ה_צטרף לשיחת קבוצה חדשה"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "הצג סמל אזור התראה:"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "cli"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "cli"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "cli"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "cli"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Configure logging system"
 msgstr "cli"
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "הצג _אירועים ממתינים"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+#, fuzzy
+msgid "Pops up a window with the next pending event"
+msgstr "cli"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "שגיאת מסד נתונים"
 
@@ -3352,47 +3364,47 @@ msgstr "מחשב על סף שינה‫"
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "היסטוריית שיחה עם ‫%s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "היסטוריית שיחה"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 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:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s מצוי/ה כעת במצב %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "שגיאה: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "שגיאה"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "מצב נוכחי: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "מצב נוכחי: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "נושא: %s\n"
@@ -3402,25 +3414,25 @@ msgstr "נושא: %s\n"
 msgid "_Change Status Message…"
 msgstr "_שנה הודעת מצב"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "באמצעות חשבון %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "ניהול סימניות"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
 msgstr "הסתר _רשימה"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "הצג _רשימה"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "הסתר תפריט זה"
 
@@ -3555,7 +3567,6 @@ msgid "Re_gister"
 msgstr "ה_רשמה"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "ה_צטרף"
@@ -3711,16 +3722,16 @@ msgstr "בחרת לסגור מספר כרטיסיות"
 msgid "Do you really want to close them all?"
 msgstr "האם אתה בטוח כי ברצונך לסגור את כולן?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "שיחות קבוצה"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "שיחות פרטיות"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "הודעות"
 
@@ -3817,7 +3828,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "שגיאה %(code)s: ‏%(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "שגיאה בעת מסירת %(message)s ‏( %(error)s )"
@@ -4128,37 +4139,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "לא היתה אפשרות לשמור את ההגדרות וההעדפות שלך"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "ברירת מחדל"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "נדרשת מימרת סיסמה"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "הזן מימרת סיסמה של מפתח OpenPGP עבור מפתח %(keyid)s (חשבון %(account)s)."
 
-#: gajim/gui_interface.py:2996
+#: gajim/gui_interface.py:2997
 msgid "OpenPGP key expired"
 msgstr "מפתח OpenPGP פקע"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "מפתח OpenPGP פקע, התחברותך אל %s תתקיים בלי OpenPGP."
 
-#: gajim/gui_interface.py:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "מימרת סיסמה שגויה"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "אנא הקלד מחדש מימרת סיסמה OpenPGP או לחץ על ביטול."
 
@@ -4725,95 +4736,85 @@ msgstr "cli"
 
 #: gajim/gajim_remote.py:89
 #, fuzzy
-msgid "Shows or hides the roster window"
-msgstr "cli"
-
-#: gajim/gajim_remote.py:93
-#, fuzzy
-msgid "Pops up a window with the next pending event"
-msgstr "cli"
-
-#: gajim/gajim_remote.py:97
-#, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr "cli"
 
-#: 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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "חשבון"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 #, fuzzy
 msgid "show only contacts of the given account"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Prints a list of registered accounts"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid "?CLI:status"
 msgstr ""
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, 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:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "הודעה"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 #, fuzzy
 msgid "status message"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 #, 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:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "_עדיפות:"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 #, 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:130
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4821,252 +4822,247 @@ msgid ""
 "key', just set 'OpenPGP key' to ''."
 msgstr "cli"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 #, fuzzy
 msgid "JID of the contact that will receive the message"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 #, fuzzy
 msgid "message contents"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 #, fuzzy
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 #, fuzzy
 msgid "if specified, the message will be sent using this account"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:143
+#: gajim/gajim_remote.py:135
 #, 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:148
+#: gajim/gajim_remote.py:140
 #, fuzzy
 msgid "subject"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 #, fuzzy
 msgid "message subject"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 #, fuzzy
 msgid "Sends new message to a groupchat you've joined."
 msgstr "cli"
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 #, fuzzy
 msgid "Gets detailed info on a contact"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 #, fuzzy
 msgid "JID of the contact"
 msgstr "cli"
 
 # BUG: on an account
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 #, fuzzy
 msgid "Name of the account"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 #, fuzzy
 msgid "Sends file to a contact"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 #, fuzzy
 msgid "file"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 #, fuzzy
 msgid "File path"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 #, fuzzy
 msgid "if specified, file will be sent using this account"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 #, fuzzy
 msgid "Lists all preferences and their values"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 #, fuzzy
 msgid "Sets value of 'key' to 'value'."
 msgstr "cli"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, fuzzy
 msgid "key=value"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 #, fuzzy
 msgid "Deletes a preference item"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 #, fuzzy
 msgid "key"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 #, fuzzy
 msgid "name of the preference to be deleted"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 #, fuzzy
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 #, fuzzy
 msgid "Removes contact from roster"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 #, fuzzy
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:219
+#: gajim/gajim_remote.py:211
 #, fuzzy
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:226
+#: gajim/gajim_remote.py:218
 #, fuzzy
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 #, fuzzy
 msgid "Sends custom XML"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 #, fuzzy
 msgid "XML to send"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, 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:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, 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:257
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:261
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "cli"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 #, fuzzy
 msgid "Missing argument \"contact_jid\""
 msgstr "cli"
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, fuzzy, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr "cli"
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 #, fuzzy
 msgid "You have no active account"
 msgstr "cli"
 
 # נראה כי Gajim לא מורץ. משכך אין באפשרותך לעשות שימוש ביישום gajim-remote.
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 #, fuzzy
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "cli"
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, fuzzy, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 #, fuzzy
 msgid "Arguments:"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, fuzzy, python-format
 msgid "%s not found"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -5075,14 +5071,14 @@ msgid ""
 "Command is one of:\n"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr "cli"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5254,7 +5250,7 @@ msgstr "סוף השבוע"
 msgid "Weekend!"
 msgstr "סופשבוע!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5263,36 +5259,36 @@ msgstr ""
 "‏JID ‏%s אינה תואמת RFC. זו לא תוסף לרשימה שלך. השתמש בכלי ניהול רשימה (roster "
 "management tools) כגון http://jru.jabberstudio.org כדי להסירה"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "בקשת ביטול הרשמה מאת %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "החדר הוחרב"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "באפשרותך להצטרף לחדר זה במקום: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "שגיאת SSL לא מוכרת: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "התקבלה הודעה בודדת חדשה מאת %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "הודעה פרטית חדשה מתוך שיחת קבוצה %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
@@ -5301,27 +5297,27 @@ msgstr ""
 # [09:08:28 PM] Myself: אני חושב שזה: המסר נשלח על-ידי...
 # [09:08:39 PM] Rodensky: לא
 # [09:08:46 PM] Rodensky: זה "התקבלה הודעה מ"
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "התקבלה הודעה מאת %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "הודעה חדשה מאת %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "המצב של %(nick)s שונה"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s התחבר/ה"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s התנתק/ה"
@@ -6491,12 +6487,12 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "צליל לניגון כאשר הודעת שמ״מ מגיעה."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "ירוק"
 
 # מכולת
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "מצרכים"
 
@@ -6645,11 +6641,11 @@ msgstr "‏%s הינו מדור אך אמור להיות קובץ"
 msgid "Error: cannot open %s for reading"
 msgstr "שגיאה: אין אפשרות לפתוח את %s לקריאה"
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr ""
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "cli"
@@ -8332,7 +8328,7 @@ msgid "Status:"
 msgstr "מצב:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_רשום היסטוריית שיחה"
 
@@ -10619,6 +10615,11 @@ msgstr "אנשי קשר אשר נשלחו:"
 msgid "Passphrase"
 msgstr "מימרת סיסמה"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "כתובת JID או שם איש קשר"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "חיפוש:"
@@ -10633,7 +10634,7 @@ msgstr "חפש בתוך _תאריך"
 msgid "Only searching within selected day"
 msgstr "חיפוש בתוך היום הנבחר בלבד"
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 msgid "_Show status changes"
 msgstr "הצג _הודעות מצב"
 
@@ -11229,6 +11230,14 @@ msgstr "אחרונים:"
 msgid "Plugin manager"
 msgstr "כשל תוסף"
 
+#, fuzzy
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "cli"
+
+#, fuzzy
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "cli"
+
 # Maybe an RTL issue would show up
 # Needs to be tested
 #, fuzzy
@@ -12325,9 +12334,6 @@ msgstr "כשל תוסף"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "צפייה במידע איש קשר (Ctrl+I)"
 
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "כתובת JID או שם איש קשר"
-
 #~ msgid "Groupchat Histories"
 #~ msgstr "היסטוריות שיחת קבוצה"
 
diff --git a/po/hr.po b/po/hr.po
index 79f0f6411c..22741fce3c 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -481,33 +481,33 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Snimiti Sliku kao..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Imam "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nepoznat"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Vrijeme:Nepoznato"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pripadnost:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -516,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:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -525,13 +525,13 @@ msgstr ""
 "Vi ste zainteresirani za informacije o prisustvu nekog kontakta, ali nju/"
 "njega ne interesira vaše prisutstvo"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, 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:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -539,15 +539,15 @@ msgid ""
 msgstr ""
 "Vi i vaš kontakt ste zainteresirani za informacije o prisustvu jedno drugog"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o vašem zahtjevu za pretplatom"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Niti jedan zahtjev za pretplatu nije u toku."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " resurs s prioritetom "
 
@@ -879,7 +879,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Datum"
 
@@ -889,7 +889,7 @@ msgid "Nickname"
 msgstr "Nadimak"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Poruka"
 
@@ -1203,6 +1203,11 @@ msgstr ""
 "Zadnje, ali ne najmanje, željeli bismo se zahvaliti svim održavateljima "
 "paketa"
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Zahvalan"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1341,7 +1346,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze nije moguća sinkronizirati vaše kontakte."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Ime"
@@ -1398,27 +1403,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Kontakt Se Prijavio"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Kontakt Se Odjavio"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Nova Poruka"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Nova Jedna Poruka"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
@@ -1451,7 +1456,7 @@ msgid "Groupchat Invitation"
 msgstr "Poziv na Grupni Razgovor"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Kontakt Promjenio Status"
 
@@ -1818,7 +1823,7 @@ 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:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je trenutno %(status)s"
@@ -2201,6 +2206,7 @@ msgid "_Accept"
 msgstr "Prihvati"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Pridruživanje"
 
@@ -2220,7 +2226,7 @@ msgstr "Spojeni računi"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2627,48 +2633,52 @@ msgstr "Upravitelj Zapisima"
 msgid "_Join New Group Chat"
 msgstr "_Pridruži se Novom Grupnom Razgovoru"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Koristi t_ray ikonu"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Prikaži samo u _listi kontakata"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Napredni Uređivač Postavki"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Konfiguracija Sobe"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Prikaži Sve _Događaje na Čekanju"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Prikazuje prozor sa sljedećim događajem na čekanju"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Pogreška Baze Podataka"
 
@@ -3260,44 +3270,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Povijest Razgovora sa %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Povijest razgovora"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Disk Error"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Greška: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Greška"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stauts je trenutno: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -3307,26 +3317,26 @@ msgstr "Tema: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Izmjena Statusne Poruke"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Podešavanje Knjižnih Oznaka"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "na _listi"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Prikaži _Listu Kontakata"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Sakrij ovaj izbornik"
 
@@ -3461,7 +3471,6 @@ msgid "Re_gister"
 msgstr "Re_gistracija"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Pridruživanje"
@@ -3613,16 +3622,16 @@ msgstr "Zatvorit će te nekoliko kartica"
 msgid "Do you really want to close them all?"
 msgstr "Da li ih zaista želite sve zatvoriti?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Grupni Razgovori"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Privanti Razgovori"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Poruke"
 
@@ -3719,7 +3728,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Greška %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
@@ -4030,37 +4039,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće spremanje vaših postavki"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "predefinirano"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Potrebna Lozinka"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG ključ istekao"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Kriva Lozinka"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Molim ponovo utipkajte svoju GPG lozinku ili pritisnite Odustani"
@@ -4625,48 +4634,40 @@ msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Prikazuje ili skriva prozor liste"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "račun"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "prikaži samo kontakte ovog računa"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registriranih računa"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Mjenja status jednog računa ili više njih"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "status"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4675,17 +4676,17 @@ msgstr ""
 "jedno od: odspojen, povezan, razgovor, odsutan, produženo nedostupan, ne "
 "uznemiravaj, nevidljiv"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "poruka"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "statusna poruka"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4694,21 +4695,21 @@ msgstr ""
 "statusa svih računa koji imaju podešenu opciju \"sinkronizacija sa globalnim "
 "statusom\""
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Mjenja status jednog ili više računa"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "prioritet"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "prioritet koji želite dodjeliti računu"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4716,7 +4717,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:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4726,29 +4727,29 @@ msgstr ""
 "Ako želite postaviti samo 'račun', bez 'OpenPGP ključa', samo postavite "
 "'OpenPGP ključ' kao ''."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontakta koji će primiti poruku"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "sadržaj poruke"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4758,119 +4759,119 @@ msgstr ""
 "Ako želite postaviti samo 'račun', bez 'OpenPGP ključa', samo postavite "
 "'OpenPGP ključ' kao ''."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "tema"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "tema poruke"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Å alje novu poruku grupnom razgovoru kojem ste pristupili."
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "JID sobe koja će primiti poruku"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID kontakta"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o računu"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Ime računa"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Å alje datoteku kontaktu"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "datoteka"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Putanja datoteke"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 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:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Prikatuje sve postavke i njihove vrijednosti"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrijednost 'ključa' na 'vrijednost'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "ključ=vrijednost"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Briše element postavke"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "ključ"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "ime postavke koja će se brisati"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Šalje korisnički XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4879,17 +4880,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:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Promjeni status"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Nadimak koji će se koristiti"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4898,19 +4899,15 @@ msgstr ""
 "Račun u kojem će xml biti poslan; ako nije specificirano, xml će biti poslan "
 "na sve račune"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Provjerite da li je Gajim pokrenut"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Prikazuje ili skriva ipython prozor"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4919,15 +4916,15 @@ msgstr ""
 "'%s' nije na vašoj listi.\n"
 "Molim odredite račun za slanje poruke."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4936,16 +4933,16 @@ msgstr ""
 "Uporaba: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4956,7 +4953,7 @@ msgstr ""
 "Uporaba: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4965,7 +4962,7 @@ msgstr ""
 "Previše argumenata. \n"
 "Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5139,7 +5136,7 @@ msgstr "Kraj tjedna"
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5149,61 +5146,61 @@ msgstr ""
 "Upotrijebite alate za upravljanje listom kontakata kao Å¡to je http://jru."
 "jabberstudio.org/ za uklanjanje"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Zahtjev za ukidanjem pretplate od %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Soba je uništena"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Možete se pridružiti ovoj sobi umjesto: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Jedna Poruka od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova Privatna Poruka iz privatnog razgovora %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je Promjenio Status"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Se Prijavio"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Se Odjavio"
@@ -6331,11 +6328,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će svirati kada stigne neka MUC poruka."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "zelena"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "namirnice"
 
@@ -6479,11 +6476,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cijan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "migriram bazu zabilješki u indekse"
 
@@ -8113,7 +8110,7 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Pamti povijest razgovora"
 
@@ -10411,6 +10408,11 @@ msgstr "Poslani kontakti:"
 msgid "Passphrase"
 msgstr "Lozinka"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Ime kontakta"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Pretraga:"
@@ -10423,7 +10425,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Pamti promjene statusa kontakata"
@@ -11017,6 +11019,12 @@ msgstr "Nedavno:"
 msgid "Plugin manager"
 msgstr "Registracija nije uspijela"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Prikazuje ili skriva prozor liste"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Prikazuje ili skriva ipython prozor"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP račun %s@%s"
@@ -12011,10 +12019,6 @@ msgstr "Registracija nije uspijela"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Pozovi kontakte na razgovor (Ctrl+G)"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Ime kontakta"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Grupni Razgovori"
diff --git a/po/hu.po b/po/hu.po
index d1080ee08b..c36f045f8e 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -484,33 +484,33 @@ msgstr "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgid "Save Image as…"
 msgstr "Kép mentése másként..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Van "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "Ismeretlen"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "Ismeretlen"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "Ismeretlen"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "<b>Szerep:</b>"
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Hovatartozás:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -519,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:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -528,13 +528,13 @@ msgstr ""
 "Érdekel, hogy a partner mikor szokott jelen lenni, de őt nem érdekli hogy te "
 "mikor szoktál"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, 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:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -542,15 +542,15 @@ msgid ""
 msgstr ""
 "Téged és a partneredet is érdekli hogy mikor szokott a másik jelen lenni"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Nincs függő feliratkozási kérelem."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " erőforrás prioritással "
 
@@ -884,7 +884,7 @@ msgid "JID"
 msgstr "Jabber Azonosító"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Dátum"
 
@@ -894,7 +894,7 @@ msgid "Nickname"
 msgstr "Becenév"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Ãœzenet"
 
@@ -1207,6 +1207,11 @@ msgstr ""
 "Végül de nem utolsó sorban köszönetet szeretnénk mondani az összes csomag "
 "karbantartónak."
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Hálás"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1347,7 +1352,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Kapcsolat nélkül nem szinkronizálhatod a partnereid."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Név"
@@ -1404,27 +1409,27 @@ 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:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Partner bejelentkezett"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Partner kijelentkezett"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Új üzenet"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Új levél"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Új privát üzenet"
 
@@ -1457,7 +1462,7 @@ msgid "Groupchat Invitation"
 msgstr "Meghívó közös társalgásba"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "A partner megváltoztatta az állapotát"
 
@@ -1820,7 +1825,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s mostantól így szerepel: %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s mostantól %(status)s"
@@ -2208,6 +2213,7 @@ msgid "_Accept"
 msgstr "_Fiókok"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Csatlakozás"
 
@@ -2227,7 +2233,7 @@ msgstr "Összevont fiókok"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2655,48 +2661,52 @@ msgstr "Előzménykezelő"
 msgid "_Join New Group Chat"
 msgstr "_Csatlakozás új közös beszélgetéshez"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Show tab when only one conversation?"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Csak a főablakban jelenítse meg"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Bővített Konfiguráció Szerkesztő"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s konfiguráció hiba"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Összes függő esemény mutatása"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Megnyit egy ablakot a következő függő eseménnyel"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Adatbázis hiba"
 
@@ -3287,44 +3297,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Beszélgetésnapló vele: %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Beszélgetés Előzmények"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Lemezhiba"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Hiba: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Hiba"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, 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:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Az állapot mostantól: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tárgy: %s\n"
@@ -3334,25 +3344,25 @@ msgstr "Tárgy: %s\n"
 msgid "_Change Status Message…"
 msgstr "Állapot üzenet _megváltoztatása"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "%s fiók használatával"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Könyvjelzők kezelése"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
 msgstr "Névsor el_rejtése"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Névsor mutatása"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Elrejti ezt a menüt"
 
@@ -3486,7 +3496,6 @@ msgid "Re_gister"
 msgstr "Re_gisztrál"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Csatlakozás"
@@ -3637,16 +3646,16 @@ msgstr "Több lap bezárása előtt állsz"
 msgid "Do you really want to close them all?"
 msgstr "Biztosan mindet be szeretnéd zárni?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Közös beszélgetések"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Privát beszélgetések"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Ãœzenetek"
 
@@ -3743,7 +3752,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "hiba ennek a küldése során %(message)s ( %(error)s )"
@@ -4059,38 +4068,38 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Nem lehet elmenteni a beállításaid."
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "alapértelmezett"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 #, fuzzy
 msgid "Passphrase Required"
 msgstr "Jelszó szükséges (vagy jelmondat?)"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG kulcs lejárt"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Rossz jelszó"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, 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"
@@ -4664,49 +4673,41 @@ msgid "show help on command"
 msgstr "mutass súgót az egyes parancsoknál"
 
 #: 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: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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "fiók"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 #, fuzzy
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Kiír egy listát a regisztrált fiókokról"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, 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:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "állapot"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4715,17 +4716,17 @@ msgstr ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "üzenet"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "állapotüzenet"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 #, fuzzy
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
@@ -4734,21 +4735,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:120
+#: gajim/gajim_remote.py:112
 #, 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:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "prioritás"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 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:124
+#: gajim/gajim_remote.py:116
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4757,7 +4758,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:130
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4768,29 +4769,29 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 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:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "üzenet tartalma"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4800,123 +4801,123 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "tárgy"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "üzenet tárgya"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 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:159
+#: gajim/gajim_remote.py:151
 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:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Részletes információkat kér le a partnerről"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "Partner Jabber Azonosítója"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Részletes információkat kér le a fiókról"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Fiók neve"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Filet küld egy partnernek"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "file"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "File elérési útvonala"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 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:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Kilistáz minden beállítást és azok értékeit"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 #, fuzzy
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "kulcs=érték"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Töröl egy beállítási elemet"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "kulcs"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "a beállítás neve ami törlődni fog"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Eltávolítja a partnert a névsorról"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 #, 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 #, 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Visszaadja az olvasatlan üzenetek számát"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Egyedi XML-t küld"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "küldendő XML"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4925,15 +4926,15 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr "Avatar megváltoztatása"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr "Használni kívánt kép"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4942,19 +4943,15 @@ msgstr ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Ellenőrizd, hogy fut-e a Gajim"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Elrejti vagy megjeleníti az ipython ablakot"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Hiányzó argumentum \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, fuzzy, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4963,15 +4960,15 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Nincs aktív fiókod"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, fuzzy, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4980,16 +4977,16 @@ msgstr ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Argumentumok:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s nincs meg"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -5000,7 +4997,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -5009,7 +5006,7 @@ msgstr ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5183,7 +5180,7 @@ msgstr "A hét vége"
 msgid "Weekend!"
 msgstr "Hétvége!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5192,61 +5189,61 @@ msgstr ""
 "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"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "liratkozási kérelem tőle: %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Szoba törölve"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Helyette csatlakozhatsz ehhez a szobához: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ismeretlen SSL hiba: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Új levél tőle: %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, 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:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, fuzzy, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Üzenetet írta: %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Új üzenet tőle: %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s megváltoztatta állapotát"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s bejelentkezett"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s kijelentkezett"
@@ -6437,11 +6434,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "zöld"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "fűszeres"
 
@@ -6583,11 +6580,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cián"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -8230,7 +8227,7 @@ msgid "Status:"
 msgstr "Állapot:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "Beszélgetés _naplózása"
 
@@ -10541,6 +10538,11 @@ msgstr "Elküldött partnerek:"
 msgid "Passphrase"
 msgstr "Passphrase"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Írja be a Jabber azonosítót, vagy a partner nevét"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Keresés:"
@@ -10553,7 +10555,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Log status changes of contacts"
@@ -11143,6 +11145,12 @@ msgstr "Legutóbbi:"
 msgid "Plugin manager"
 msgstr "Regisztráció nem sikerült"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Megjeleníti vagy elrejti a névsor ablakot"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Elrejti vagy megjeleníti az ipython ablakot"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP fiók %s@%s"
@@ -12226,9 +12234,6 @@ msgstr "Regisztráció nem sikerült"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Írja be a Jabber azonosítót, vagy a partner nevét"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Groupchat Histories"
diff --git a/po/it.po b/po/it.po
index 0c2ed5696f..1de4fb4216 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -487,32 +487,32 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Salva immagine come..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 msgid "Save _As"
 msgstr "Salv_a come "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?OS:Sconosciuto"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Time:Sconosciuto"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Role in Group Chat:<b>Ruolo:</b>"
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliazione:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -521,7 +521,7 @@ msgstr ""
 "Questo contatto è interessato alle informazioni sulla tua presenza, ma tu "
 "non sei interessato alla sua"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -530,14 +530,14 @@ msgstr ""
 "Sei interessato alle informazioni sulla presenza di questo contatto, ma lui/"
 "lei non è interessato/a alla tua"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, 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:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -546,16 +546,16 @@ msgstr ""
 "Tu e il contatto siete reciprocamente interessati alle informazioni sulla "
 "presenza dell'altro"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Non c'è nessuna richiesta di sottoscrizione in attesa."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
@@ -856,7 +856,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Data"
 
@@ -866,7 +866,7 @@ msgid "Nickname"
 msgstr "Soprannome"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Messaggio"
 
@@ -1166,6 +1166,11 @@ msgstr "Per ultimo ma non meno importante"
 msgid "we would like to thank all the package maintainers."
 msgstr "vogliamo ringraziare tutti i gestori dei pacchetti."
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Riconoscente"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1310,7 +1315,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senza una connessione, non puoi sincronizzare i tuoi contatti."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nome"
@@ -1366,27 +1371,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Le password immesse nei due campi devono essere identiche."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Nuovo messaggio singolo"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
@@ -1419,7 +1424,7 @@ msgid "Groupchat Invitation"
 msgstr "Invito in una conversazione di gruppo"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Il contatto ha cambiato stato"
 
@@ -1816,7 +1821,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s è ora conosciuto come %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s è ora %(status)s"
@@ -2193,6 +2198,7 @@ msgid "_Accept"
 msgstr "_Accetta"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Unisciti"
 
@@ -2212,7 +2218,7 @@ msgstr "Account uniti"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2613,45 +2619,49 @@ msgstr "Gestore della cronologia"
 msgid "_Join New Group Chat"
 msgstr "_Unisciti a una nuova conversazione di gruppo"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 msgid "Show the application's version"
 msgstr "Mostra la versione dell'applicazione"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 msgid "Show only critical errors"
 msgstr "Mostra solo gli errori critici"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "Stampa xml stanza e altre informazioni di debug"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 msgid "Use defined profile in configuration directory"
 msgstr "Usa il profilo definito nella cartella di configurazione"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 msgid "Set configuration directory"
 msgstr "Imposta la cartella di configurazione"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr "Configura il sistema di registrazione degli eventi"
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Mostra tutti gli _eventi in attesa"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Apre una finestra con il prossimo evento in attesa"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Errore del database"
 
@@ -3241,44 +3251,44 @@ msgstr "Macchina in fase di sospensione"
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Cronologia delle conversazioni con %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Cronologia delle conversazioni"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Errore del disco"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Errore: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Errore"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Soggetto: %s\n"
@@ -3287,24 +3297,24 @@ msgstr "Soggetto: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Cambia il messaggio di stato…"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "usando l'account %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 msgid "_Manage Bookmarks…"
 msgstr "_Gestisci i segnalibri…"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
 msgstr "Nascondi l'elenco dei tuoi _contatti"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Mostra l'elenco dei tuoi _contatti"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Nascondi questo menù"
 
@@ -3436,7 +3446,6 @@ msgid "Re_gister"
 msgstr "_Registra"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "Join"
 msgstr "Entra"
 
@@ -3587,16 +3596,16 @@ msgstr "Stai per chiudere diverse schede"
 msgid "Do you really want to close them all?"
 msgstr "Vuoi davvero chiuderle tutte?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Coversazioni di gruppo"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Conversazioni private"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Messaggi"
 
@@ -3696,7 +3705,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Errore %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errore durante l'invio di %(message)s ( %(error)s )"
@@ -4013,38 +4022,38 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "predefinito"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Frase di accesso richiesta"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 msgid "OpenPGP key expired"
 msgstr "Chiave OpenPGP scaduta"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Frase di accesso errata"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 "Per piacere, reinserisci la frase di accesso per OpenPGP o premi Annulla."
@@ -4611,46 +4620,38 @@ msgid "show help on command"
 msgstr "mostra l'aiuto sul comando"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Mostra o nascondi la finestra dei contatti"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 msgid "?CLI:account"
 msgstr "?CLI:account"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "mostra solo i contatti dell'account dato"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Scrive un elenco degli account registrati"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Cambia lo stato degli account"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid "?CLI:status"
 msgstr "?CLI:stato"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4658,16 +4659,16 @@ msgstr ""
 "uno fra: offline, online, chat, away, xa, dnd, invisible. Se non impostato, "
 "usa lo stato precedente dell'account"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 msgid "?CLI:message"
 msgstr "?CLI:messaggio"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "messaggio di stato"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4676,20 +4677,20 @@ msgstr ""
 "cambiare lo stato di tutti gli account che hanno marcato l'opzione "
 "\"sincronizza con lo stato globale\""
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Cambia la priorità dell'account o degli account"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "?CLI:priority"
 msgstr "?CLI:priorità"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "priorità che vuoi dare all'account"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4698,7 +4699,7 @@ msgstr ""
 "stato di tutti gli account che hanno marcata l'opzione \"sincronizza con lo "
 "stato globale\""
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4708,30 +4709,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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID del contatto che riceverà il messaggio"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "contenuti dei messaggi"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4741,124 +4742,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:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "oggetto"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "oggetto del messaggio "
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 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:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "JID della stanza che riceverà il messaggio"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID del contatto"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Nome dell'account"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Invia un file ad un contatto"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "file"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Percorso del file"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "se specificato, il file verrà inviato usando questo account"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Mostra tutte le preferenze ed i relativi valori"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Imposta il valore di 'chiave' a 'valore'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "chiave=valore"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Elimina un oggetto dalle preferenze"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "chiave"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "nome della preferenza da eliminare"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Rimuove il contatto dal tuo elenco"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Restituisce il numero di messaggi non letti"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Invia un file XML personalizzato"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML da inviare"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4867,15 +4868,15 @@ msgstr ""
 "L'account al quale l'xml è inviato; se non specificato, l'xml sarà spedito a "
 "tutti gli account."
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr "Cambia l'avatar"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr "Immagine da usare"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4883,19 +4884,15 @@ 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:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Controlla se Gajim è in esecuzione"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Mostra o nasconde la finestra di ipython"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Parametro mancante \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4904,17 +4901,17 @@ msgstr ""
 "'%s' non appartiene alla lista contatti.\n"
 "Specificare l'account per l'invio del messaggio."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Non ci sono account attivi"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4923,16 +4920,16 @@ msgstr ""
 "Uso: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Parametri:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s non trovato"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4945,7 +4942,7 @@ msgstr ""
 "\n"
 "Il comando è uno di:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4954,7 +4951,7 @@ msgstr ""
 "Troppi parametri. \n"
 "Scrivere \"%(basename)s help %(command)s\" per maggiori informazioni"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5128,7 +5125,7 @@ msgstr "Fine della settimana"
 msgid "Weekend!"
 msgstr "Fine-settimana!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5138,61 +5135,61 @@ msgstr ""
 "strumenti di gestione dei contatti come http://jru.jabberstudio.org/ per "
 "rimuoverlo"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "richiesta di cancellazione abbonamento da %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "La stanza è stata eliminata"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Puoi invece entrare in questa stanza: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Errore SSL sconosciuto: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuovo messaggio singolo da %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, 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:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Messaggio inviato da %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuovo messaggio da %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ha cambiato stato"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s si è connesso"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s si è disconnesso"
@@ -6355,11 +6352,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Suono da riprodurre quando un messaggio MUC arriva."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "green"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "grocery"
 
@@ -6500,11 +6497,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "Migrazione del database delle cronologie negli indici"
 
@@ -8135,7 +8132,7 @@ msgid "Status:"
 msgstr "Stato:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Memorizza la cronologia della conversazione"
 
@@ -10397,6 +10394,11 @@ msgstr "Contatti inviati:"
 msgid "Passphrase"
 msgstr "Frase di accesso"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Inserire il JID o il nome del contatto"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Cerca:"
@@ -10410,7 +10412,7 @@ msgstr "Ricerca nella data"
 msgid "Only searching within selected day"
 msgstr "Ricerca nel solo giorno selezionato"
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 msgid "_Show status changes"
 msgstr "_Mostra i cambiamenti di stato"
 
@@ -11006,6 +11008,12 @@ msgstr "Cronologia dei registri"
 msgid "Plugin manager"
 msgstr "Plugin fallito"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Mostra o nascondi la finestra dei contatti"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Mostra o nasconde la finestra di ipython"
+
 #~ msgid "XMPP account %s"
 #~ msgstr "Account XMPP %s"
 
@@ -12147,9 +12155,6 @@ msgstr "Plugin fallito"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Inserire il JID o il nome del contatto"
-
 #~ msgid "Groupchat Histories"
 #~ msgstr "Cronologia delle conversazioni di gruppo"
 
diff --git a/po/ja.po b/po/ja.po
index 123bccae8f..810f314ab1 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -475,32 +475,32 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "画像の保存…"
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 msgid "Save _As"
 msgstr "名前を付けて保存 (_A)"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "不明"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "不明"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "不明"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "<b>å½¹:</b>"
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>分掌:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
@@ -508,7 +508,7 @@ msgstr ""
 "この相手先はあなたの在席情報に関心があります。しかし、あなたはこの相手先の在"
 "席情報に関心がありません。"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
@@ -516,25 +516,25 @@ msgstr ""
 "あなたは相手先の在席情報に関心があります。しかし、相手先はそうではありませ"
 "ん。"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 msgid "The contact and you want to exchange presence information"
 msgstr "あなたと相手先は相互の在席情報を送信します。"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "あなたと相手先は相互の在席情報に関心がありません。"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "あなたからの在席通知の申し込みに対する相手先からの回答を待っています。"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "保留中の在席通知の申し込みはありません。"
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " リソース。優先順位は "
 
@@ -830,7 +830,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "日付"
 
@@ -840,7 +840,7 @@ msgid "Nickname"
 msgstr "ニックネーム"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "メッセージ"
 
@@ -1135,6 +1135,11 @@ msgstr "最後に大切なことを付け加えますと、"
 msgid "we would like to thank all the package maintainers."
 msgstr "すべてのパッケージのメンテナに感謝いたします。"
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "感謝"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Mako N (mako AT pasero.net)"
@@ -1266,7 +1271,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "接続していないと、相手先を合わせることはできません。"
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "名前"
@@ -1320,27 +1325,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "ふたつの欄のパスワードは同じにしてください。"
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "相手先がサインインしました"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "相手先がサインアウトしました"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "新着メッセージ"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "新着の単発メッセージ"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "新着の私信"
 
@@ -1373,7 +1378,7 @@ msgid "Groupchat Invitation"
 msgstr "グループチャットへの招待"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "相手先が在席状況を変更"
 
@@ -1728,11 +1733,11 @@ msgstr "ファイルを転送"
 
 #: gajim/dialogs.py:5438
 msgid "Requesting HTTP Upload Slot..."
-msgstr ""
+msgstr "HTTP アップロード枠を要求しています..."
 
 #: gajim/dialogs.py:5442
 msgid "Uploading file via HTTP File Upload..."
-msgstr ""
+msgstr "「HTTP ファイルアップロード」でファイルをアップロードしています..."
 
 #: gajim/dialogs.py:5446
 msgid "Encrypting file..."
@@ -1744,7 +1749,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s さんは現在 %(new_nick)s さんと認識されました"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s さんは現在 %(status)s"
@@ -2115,6 +2120,7 @@ msgid "_Accept"
 msgstr "承諾する (_A)"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "参加 (_J)"
 
@@ -2134,7 +2140,7 @@ msgstr "統合アカウント"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2526,43 +2532,47 @@ msgstr "履歴マネージャ"
 msgid "_Join New Group Chat"
 msgstr "新しいグループチャットに参加 (_J)"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 msgid "Show the application's version"
 msgstr "アプリケーションのバージョンを表示"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 msgid "Show only critical errors"
 msgstr "深刻なエラーのみ表示"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr "プロフィールのファイルを完全に分離する(履歴データベースやプラグインも)"
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr "XML スタンザとその他のデバッグ情報を出力"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 msgid "Use defined profile in configuration directory"
 msgstr "設定ディレクトリ内の設定ファイルを指定"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 msgid "Set configuration directory"
 msgstr "設定ファイルのディレクトリを指定"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr "ログシステムを設定"
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 msgid "Show all warnings"
 msgstr "すべての警告を表示"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
-msgstr "ipython のシェルを開く"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
+msgstr "IPython のシェルを開く"
+
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "次の保留イベントをポップアップウィンドウに表示します"
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "データベースのエラー"
 
@@ -3155,44 +3165,44 @@ msgstr "コンピューターを終了しています"
 msgid "Disconnect from the network"
 msgstr "ネットワークから切断"
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "%s さんとの会話の履歴"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "会話の履歴"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "ディスクのエラー"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s さんは現在、%(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "エラー: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "エラー"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "現在の状況: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "現在の状況: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "件名: %s\n"
@@ -3201,24 +3211,24 @@ msgstr "件名: %s\n"
 msgid "_Change Status Message…"
 msgstr "状況メッセージを変更…(_C)"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "アカウント %s で"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 msgid "_Manage Bookmarks…"
 msgstr "ブックマークを管理…(_M)"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
 msgstr "名簿を閉じる (_R)"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "名簿を表示 (_R)"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "このメニューを表示しない"
 
@@ -3349,7 +3359,6 @@ msgid "Re_gister"
 msgstr "登録 (_G)"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "Join"
 msgstr "参加"
 
@@ -3499,15 +3508,15 @@ msgstr "タブを閉じようとしています"
 msgid "Do you really want to close them all?"
 msgstr "本当にそれらをすべて閉じますか ?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 msgid "?Noun:Chats"
 msgstr "チャット"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "個人チャット"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "メッセージ"
 
@@ -3602,7 +3611,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "エラー %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "%(message)s を送信する際にエラー ( %(error)s )"
@@ -3915,38 +3924,38 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "設定を保存できませんでした"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "デフォルト"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "パスフレーズが必要です"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 msgid "OpenPGP key expired"
 msgstr "OpenPGP 鍵は期限切れです"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "OpenPGP 鍵は有効期限が切れています。OpenPGP なしに %s に接続します。"
 
-#: gajim/gui_interface.py:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "パスフレーズが間違っています"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 "OpenPGP のパスフレーズをもういちど入力するか、または「中止」を押してくださ"
@@ -4176,9 +4185,8 @@ msgstr ""
 "ローカルの伝送がうまく働いていないようです。"
 
 #: gajim/dialog_messages.py:137 gajim/dialog_messages.py:142
-#, fuzzy
 msgid "Could not request upload slot"
-msgstr "ローカルのサービスを起動できませんでした"
+msgstr "アップロード枠を要求できませんでした"
 
 #: gajim/dialog_messages.py:143
 msgid "Got unexpected response from server (see log)"
@@ -4191,15 +4199,15 @@ msgstr "ファイルを開けませんでした"
 #: gajim/dialog_messages.py:148
 msgid "Exception raised while opening file (see log)"
 msgstr ""
+"ファイルを開いているあいだに例外が発生しました (ログを参照してください)"
 
 #: gajim/dialog_messages.py:157
 msgid "Unsecure"
-msgstr ""
+msgstr "安全ではありません"
 
 #: gajim/dialog_messages.py:158
-#, fuzzy
 msgid "Server returned unsecure transport (http)"
-msgstr "サービスはエラーを返しました。"
+msgstr "サーバーは安全でない経路 (http) を返しました"
 
 #: gajim/dialog_messages.py:162
 msgid "Could not upload file"
@@ -4219,9 +4227,8 @@ msgid "Encryption Error"
 msgstr "暗号化のエラー"
 
 #: gajim/dialog_messages.py:173
-#, fuzzy
 msgid "For the choosen encryption is no encryption method available"
-msgstr "接続は有効ではありません"
+msgstr "その暗号化は有効な暗号化方式ではありません"
 
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
@@ -4470,42 +4477,34 @@ msgid "show help on command"
 msgstr "コマンドのヘルプを表示します"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "名簿ウィンドウの表示/非表示"
-
-#: gajim/gajim_remote.py:93
-msgid "Pops up a window with the next pending event"
-msgstr "次の保留イベントをポップアップウィンドウに表示します"
-
-#: gajim/gajim_remote.py:97
 msgid "Lists all contacts in roster, one for each line"
 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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 msgid "?CLI:account"
 msgstr "?CLI:アカウント"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "指定されたアカウントの相手先のみ表示します"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "登録アカウントの一覧の表示します"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 msgid "Changes the status of account(s)"
 msgstr "アカウントの在席状況の変更します"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid "?CLI:status"
 msgstr "?CLI:在席状況"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4514,16 +4513,16 @@ msgstr ""
 "away (離席中)、xa (不在)、dnd (取り込み中)、invisible (居ないふり)。設定され"
 "なければ、アカウントの以前の状況が使われます"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 msgid "?CLI:message"
 msgstr "?CLI:メッセージ"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "状況メッセージ"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4532,19 +4531,19 @@ msgstr ""
 "合、\"sync with global status\" オプションが設定されているアカウントすべての"
 "在席状況を変更します。"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 msgid "Changes the priority of account(s)"
 msgstr "アカウントの優先順位を変更します"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "?CLI:priority"
 msgstr "?CLI:優先順位"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "アカウントに設定する優先順位"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4552,7 +4551,7 @@ msgstr ""
 "アカウントの優先順位を変更します。アカウントが指定されない場合、\"sync with "
 "global status\" オプションの設定されたアカウントすべての優先順位を変更します"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4562,29 +4561,29 @@ msgstr ""
 "らも指定しなくてもかまいません。 'アカウント'(account) だけを設定して "
 "'OpenPGP 鍵' を設定したくない場合、'OpenPGP 鍵' は単に '' としてください。"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "メッセージを受け取りたい相手先の JID"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "メッセージの内容"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr "PGP 鍵"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "指定した場合、メッセージはこの公開鍵で暗号化されます"
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr "指定した場合、メッセージはこのアカウントを使って送られます"
 
-#: gajim/gajim_remote.py:143
+#: gajim/gajim_remote.py:135
 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 \"\"."
@@ -4593,123 +4592,123 @@ msgstr ""
 "しなくてもかまいません。 'アカウント'(account) だけを設定したい場"
 "合、'OpenPGP 鍵' は単に \"\" としてください。"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "件名"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "メッセージの件名"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr "参加しているグループチャットに新しいメッセージを送信します。"
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "メッセージを受け取る談話室そのものの JID"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "相手先の詳細情報を取得します"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "相手先の JID"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "アカウントの詳細情報を取得します"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "アカウント名"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "相手先にファイルを転送します"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "ファイル"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "ファイルの場所"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "指定した場合、このアカウントを使ってファイルを転送します"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "すべての設定項目とその値の一覧を表示します"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "項目 'key' の値に 'value' を設定します。"
 
 # (Mako)訳さずにそのままにしよう
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "key=value"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'key' は設定項目の名前、'value' はそれに設定したい値"
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "設定項目を削除します"
 
 # (Mako)訳さずにそのままにしよう
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "key"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "削除する設定項目の名前"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim の設定の現在の状態を .config ファイルに書き出します"
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "相手先を名簿から削除します"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "指定した場合、相手先はこのアカウントの相手先一覧から選択します"
 
-#: gajim/gajim_remote.py:219
+#: gajim/gajim_remote.py:211
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "現在の在席状況を返します (もしアカウントが指定されなければ、全体の在席状況を"
 "返します)"
 
-#: gajim/gajim_remote.py:226
+#: gajim/gajim_remote.py:218
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "現在の状況メッセージを返します (もしアカウントが指定されなければ、全体の状況"
 "メッセージを返します)"
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "未読メッセージ数を返します"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "独自の XML を送信します"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "送信する XML"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
@@ -4717,15 +4716,15 @@ msgstr ""
 "XML が送信されるアカウント。指定されない場合、XML はすべてのアカウントに送信"
 "されます"
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr "アバターを変更する"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr "使いたい画像"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4733,19 +4732,15 @@ msgstr ""
 "アバターを設定するアカウント。指定されない場合、アバターはすべてのアカウント"
 "に設定されます"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Gajim が起動しているかチェックします"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "ipython ウィンドウの表示/非表示"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "引数 \"contact_jid\" がありません"
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4754,15 +4749,15 @@ msgstr ""
 "'%s' は名簿にありません。\n"
 "メッセージを送るためのアカウントを指定してください。"
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "有効になっているアカウントがありません"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim が起動していないようです。そのため gajim-remote は使えません。"
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4771,16 +4766,16 @@ msgstr ""
 "使い方: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "引数:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s は見つかりません"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4793,7 +4788,7 @@ msgstr ""
 "\n"
 "コマンドは次のいずれか:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4802,7 +4797,7 @@ msgstr ""
 "引数が多すぎます。\n"
 "詳しくは \"%(basename)s help %(command)s\" と入力してください"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4977,7 +4972,7 @@ msgstr "週の終わり"
 msgid "Weekend!"
 msgstr "週末 !"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4987,61 +4982,61 @@ msgstr ""
 "には、http://jru.jabberstudio.org/ のような名簿管理ツールを使ってください。"
 
 # (Mako) 実際に使われている場所を確認していないが、強引に訳す
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "%s から継読中止の要求"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "談話室は閉鎖されました"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "代わりに次の談話室に参加できます: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "未知の SSL エラー: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "%(nickname)s からの新しい単発メッセージ"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "グループチャット %s からの新着の私信"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s さん: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "%(nickname)s さんからのメッセージ"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "%(nickname)s さんからの新着メッセージ"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s さんの在席状況が変わりました"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s さんがサインインしました"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s さんがサインアウトしました"
@@ -5056,11 +5051,11 @@ msgid ""
 "and does not have focus"
 msgstr ""
 "この相手先のチャットウィンドウが開いていてフォーカスが当たっていない場合でも"
-"デスクトップ通知を表示する"
+"デスクトップ通知を表示します"
 
 #: gajim/common/config.py:77
 msgid "Play sound when user is busy"
-msgstr "取り込み中でもサウンドを鳴らす"
+msgstr "取り込み中でもサウンドを鳴らします"
 
 #: gajim/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
@@ -5261,7 +5256,7 @@ msgstr ""
 
 #: gajim/common/config.py:171
 msgid "Place the roster on the right in single window mode"
-msgstr "ひとつのウィンドウの場合、名簿を右側にする"
+msgstr "ひとつのウィンドウの場合、名簿を右側にします"
 
 #: gajim/common/config.py:177
 msgid ""
@@ -5320,7 +5315,7 @@ msgstr ""
 #: gajim/common/config.py:187
 msgid ""
 "Should autorejoin be activated when we are being kicked from a conference?"
-msgstr "談話室から蹴り出された場合、自動で再参加するか。"
+msgstr "談話室から蹴り出された場合、自動で再参加するかどうか。"
 
 #: gajim/common/config.py:188
 msgid ""
@@ -5590,7 +5585,7 @@ msgid ""
 "'never' - Never show roster.\n"
 "'last_state' - Restore the last state roster."
 msgstr ""
-"起動時に名簿を表示するか。\n"
+"起動時に名簿を表示するかどうか。\n"
 "'always'(常に) - 常に名簿を表示する。\n"
 "'never'(なし) - 名簿を表示しない。\n"
 "'last_state'(以前の状態) - 以前の名簿の表示状態のとおりにする。"
@@ -5802,7 +5797,7 @@ msgstr ""
 
 #: gajim/common/config.py:304
 msgid "Show a mini avatar in chat window tabs and in window icon"
-msgstr "チャットウィンドウとウィンドウアイコンに小さなアバターを表示する"
+msgstr "チャットウィンドウとウィンドウアイコンに小さなアバターを表示します"
 
 #: gajim/common/config.py:305
 msgid "If True, Gajim will use the Systems Keyring to store account passwords."
@@ -5912,7 +5907,7 @@ msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
-"Gajim 起動時にサーバーに保存されている記録をダウンロードする(サーバーが "
+"Gajim 起動時にサーバーに保存されている記録をダウンロードします(サーバーが "
 "XEP-0313 に対応している場合)"
 
 #: gajim/common/config.py:359
@@ -5960,11 +5955,11 @@ msgstr ""
 
 #: gajim/common/config.py:388
 msgid "Answer to receipt requests"
-msgstr "受領確認に応じる"
+msgstr "受領確認に応じます"
 
 #: gajim/common/config.py:389
 msgid "Sent receipt requests"
-msgstr "受領確認を求める"
+msgstr "受領確認を求めます"
 
 #: gajim/common/config.py:398
 msgid ""
@@ -6023,13 +6018,15 @@ msgstr "次回の起動時にチャットウィンドウを開く JID の一覧
 
 #: gajim/common/config.py:411
 msgid "HTTP Upload: Enable HTTPS Verification"
-msgstr ""
+msgstr "HTTP アップロード: 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 ""
+"チャットウィンドウへのファイルのドラッグアンドドロップで用いられる転送方"
+"法。'httpupload' (デフォルト)または 'jingle'"
 
 #: gajim/common/config.py:475 gajim/common/config.py:480
 msgid "Language for which we want to check misspelled words"
@@ -6153,11 +6150,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "グループチャットのメッセージがあった際にサウンドを鳴らします。"
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "green"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "grocery"
 
@@ -6299,12 +6296,12 @@ msgstr "%s はディレクトリです。ファイルでなければなりませ
 msgid "Error: cannot open %s for reading"
 msgstr "エラー: 読み込みモードで %s を開けません"
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyan"
 
 # (Mako) create index のこと
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "記録データベースからインデックスを作成します"
 
@@ -7928,7 +7925,7 @@ msgid "Status:"
 msgstr "在席状況:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "会話の履歴を記録 (_L)"
 
@@ -9910,7 +9907,7 @@ msgstr ""
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
 msgid "column"
-msgstr ""
+msgstr "カラム"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
@@ -10112,6 +10109,10 @@ msgstr "相手先を削除"
 msgid "Passphrase"
 msgstr "パスフレーズ"
 
+#: gajim/data/gui/history_window.ui:38
+msgid "Enter name / JID of contact or groupchat"
+msgstr "相手先またはグループチャットの名前 / JID を入力してください"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "検索:"
@@ -10124,7 +10125,7 @@ msgstr "ある日の中で検索 (_I)"
 msgid "Only searching within selected day"
 msgstr "選択した日の中だけでの検索 "
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 msgid "_Show status changes"
 msgstr "相手先の状況変更を記録する (_S)"
 
@@ -10717,6 +10718,12 @@ msgstr "会話の履歴"
 msgid "Plugin manager"
 msgstr "プラグイン管理"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "名簿ウィンドウの表示/非表示"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "ipython ウィンドウの表示/非表示"
+
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP アカウント %s"
 
diff --git a/po/kk.po b/po/kk.po
index 6146cc4e0b..26ac1c6270 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -482,33 +482,33 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Суретті қалайша сақтау..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Бар "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Клиент:Белгісіз"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?ОЖ:Белгісіз"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Уақыты:Белгісіз"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Role in Group Chat:<b>Ролі:</b>"
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Қатысуы:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -517,34 +517,34 @@ msgstr ""
 "Бұл контакт сіздің бар болуы ақпаратыңызға қызығада, сіз болсаңыз, оған "
 "қызықпайсыз"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr "Сіз контакттың бар болуына қызығасыз, ол болса, сіздікіне қызықпайды"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Сіз бен контакт өзара бар болуы ақпаратына қызығасыз"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Сіз бен контакт өзара бар болуы ақпаратына қызығасыз"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Сіз осы контакттың өзіңіз жіберген жазылуға сұраным жауабын күтудесіз"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Кезекте жазылуға сұранымдар жоқ."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " ресурс приоритеті"
 
@@ -878,7 +878,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Уақыты"
 
@@ -888,7 +888,7 @@ msgid "Nickname"
 msgstr "Ник аты"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Хабарлама"
 
@@ -1196,6 +1196,11 @@ msgstr ""
 msgid "we would like to thank all the package maintainers."
 msgstr "Барлық дестелер жинаушыларға ризамызды білдіреміз."
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Сыйлаушы"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2009-2010"
@@ -1331,7 +1336,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Байланыс орнатылмаса, контакттарды синхрондай алмайсыз."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Аты"
@@ -1388,27 +1393,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Екі өрістегі де парольдер өзара сәйкес болуы тиіс."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Контакт кірді"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Контакт шықты"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Жаңа хабарлама"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Жаңа бір хабарлама"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Жаңа жеке хабарлама"
 
@@ -1441,7 +1446,7 @@ msgid "Groupchat Invitation"
 msgstr "Топ чатына шақыру"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Контакт қалып-күйін өзгертті"
 
@@ -1802,7 +1807,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s енді %(new_nick)s ретінде белгілі болады"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s қазір %(status)s"
@@ -2183,6 +2188,7 @@ msgid "_Accept"
 msgstr "_Тіркелгілер"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Кіру"
 
@@ -2202,7 +2208,7 @@ msgstr "Біріктірілген тіркелгілер"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2604,49 +2610,53 @@ msgstr "Тарихты басқару"
 msgid "_Join New Group Chat"
 msgstr "Жаңа _чат бөлмесіне кіру"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Жүйелік сөре таңбашасын көрсету:"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Тек ростерде көрсету"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Кеңейтілген баптаулар түзетушісі"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s баптау қатесі"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Configure logging system"
 msgstr "%s баптау"
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Қат_ыспаған оқиғаларды көрсету"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Келесі кезектегі оқиға бар қалқымалы терезені көрсетеді"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Дерекқор қатесі"
 
@@ -3233,44 +3243,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Сіз бен %s сөйлесулер тарихы"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Чат тарихы"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Диск қатесі"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s қазір %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Қате: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Қате"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Қазір қалып-күйі: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Қазір қалып-күйі: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тақырыбы: %s\n"
@@ -3280,25 +3290,25 @@ msgstr "Тақырыбы: %s\n"
 msgid "_Change Status Message…"
 msgstr "Қалып-кү_й хабарламасын өзгерту"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "%s тіркелгісін қолданып"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Бетбелгілерді басқару"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
 msgstr "Р_остерді жасыру"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "_Ростерді көрсету"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Бұл мәзірді жасыру"
 
@@ -3431,7 +3441,6 @@ msgid "Re_gister"
 msgstr "_Тіркелу"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Кіру"
@@ -3581,16 +3590,16 @@ msgstr "Сіз бірнеше чатты жабуды таңдадыңыз"
 msgid "Do you really want to close them all?"
 msgstr "Сіз олардың барлығын жабуды таңдайсыз ба?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Чат бөлмелері"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Жеке чаттар"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Хабарламалар"
 
@@ -3686,7 +3695,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Қате %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "%(message)s жіберу кезіндегі қате ( %(error)s )"
@@ -3998,28 +4007,28 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Баптауларыңызды сақтау мүмкін емес"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "бастапқысы"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Кілтсөз керек"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG кілтінің мерзімі біткен"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
@@ -4027,11 +4036,11 @@ msgstr ""
 "Сіздің GPG кілтіңіздің мерзімі біткен, сол үшін сіз %s үшін байланысыңыз "
 "OpenPGP-сіз іске асырылады."
 
-#: gajim/gui_interface.py:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Кілтсөз қате"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Өзіңіздің GPG кілтсөзіңізді қайта енгізіңіз не Бас тартуды қалаңыз."
@@ -4592,47 +4601,39 @@ msgid "show help on command"
 msgstr "команда көмегін көрсету"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Ростер терезесін көрсетеді не жасырады"
-
-#: gajim/gajim_remote.py:93
-msgid "Pops up a window with the next pending event"
-msgstr "Келесі кезектегі оқиға бар қалқымалы терезені көрсетеді"
-
-#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Ростердегі бар контакттар тізімін шығарады. Әр контакт бөлек жолда болады"
 
-#: 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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "тіркелгі"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "тек көрсетілген тіркелгі контакттарын көрсету"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Бар тіркелгілер тізімін шығарады"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Тіркелгі не тіркелгілердің қалып-күйін өзгерту"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "күйі"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4641,17 +4642,17 @@ msgstr ""
 "қалған, мазамды алмаңыз, жасырын. Орнатылмаса, тіркелгінің алдыңғы күйі "
 "қолданылады"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "хабарлама"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "қалып-күй хабарламасы"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4659,21 +4660,21 @@ msgstr ""
 "\"Тіркелгі\" тіркелгісінің қалып-күйін өзгертеді. Көрсетілмесе, \"sync with "
 "global status\" опциясы орнатылған барлық тіркелгілерге әсер етеді"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Бір не бірнеше тіркелгі үшін приоритетті өзгертеді"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "приоритет"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "тіркелгіге бергіңіз келетін приоритет"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4681,7 +4682,7 @@ msgstr ""
 "көрсетілген тіркелгінің қалып-күйін өзгерту. Көрсетілмесе, барлық \"sync "
 "with global status\" опциясы орнатылған тіркелгілерге әсер етеді"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4691,29 +4692,29 @@ msgstr ""
 "тіркелгіні көрсету міндетті емес. Егер сіз 'OpenPGP key'-сіз тек 'account'-"
 "ты орнатқыңыз келсе, 'OpenPGP key' мәнін '' етіп орнатыңыз."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "Хабарламаны алатын контакттың JID-і"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "хабарлама құрамасы"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "көрсетілсе, хабарлама бұл ортақ кілтпен шифрленеді"
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr "көрсетілсе, хабарлама бұл тіркелгіні қолданып жіберіледі"
 
-#: gajim/gajim_remote.py:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4723,121 +4724,121 @@ msgstr ""
 "тіркелгіні көрсету міндетті емес. Егер сіз 'OpenPGP key'-сіз тек 'account'-"
 "ты орнатқыңыз келсе, 'OpenPGP key' мәнін '' етіп орнатыңыз."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "тақырып"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "хабарлама тақырыбы"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Сіз кірген топ чатына жаңа хабарламаны жіберу."
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "хабарламаны алатын бөлменің JID-і"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Контакттың толық ақпаратын алу"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "Контакт JID-і"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Тіркелгінің толық ақпаратын алу"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Тіркелгі аты"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Контактқа файлды жібереді"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "файл"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Файл орналасуы"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "көрсетілсе, файл бұл тіркелгіні қолданып жіберіледі"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Барлық баптаулар мен олардың мәндерін тізіп шығу"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "'key' мәнін 'value' етіп орнатады."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "key=value"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "'key' - баптаудың аты, 'value' - орнатылатын мәні"
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Баптау элементін өшіру"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "кілт"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "өшірілетін баптау аты"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim ағымдағы баптауларын .config файлына жазу"
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Ростерден контактты өшіреді"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "көрсетілсе, контакттар бұл тіркелгінің тізімінен алынады"
 
-#: gajim/gajim_remote.py:219
+#: gajim/gajim_remote.py:211
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Ағымдағы қалып-күйді қайтарады (тіркелгі көрсетілмесе, жалпыны қолданады)"
 
-#: gajim/gajim_remote.py:226
+#: gajim/gajim_remote.py:218
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Ағымдағы қалып-күй хабарламасын қайтарады (тіркелгі көрсетілмесе, жалпыны "
 "қолданады)"
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Оқылмаған хабарламалар саның қайтарады"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Таңдауыңызша XML жіберу"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "Жіберілетін XML"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4845,15 +4846,15 @@ msgid ""
 msgstr ""
 "Xml жібетілетін тіркелгі; көрсетілмесе, xml барлық тіркелгілерге жіберіледі"
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr "Аватарды өзгерту"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr "Қолдану үшін сурет"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4861,19 +4862,15 @@ msgstr ""
 "Аватар орнатылатын тіркелгі; көрсетілмесе, аватар барлық тіркелгілерге "
 "орнатылады"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Gajim қосулы тұрғанына көз жеткізіңіз"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "ipython терезесін көрсетеді не жасырады"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "\"contact_jid\" аргументі жоқ"
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4882,15 +4879,15 @@ msgstr ""
 "'%s' ростеріңізде жоқ.\n"
 "Хабарламаны жіберу үшін тіркелгіні көрсетіңіз."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Сізде белсенді тіркелгі жоқ"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim қосулы емес сияқты. Сол үшін gajim-remote қолдануға болмайды."
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4899,16 +4896,16 @@ msgstr ""
 "Қолданылуы: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Аргументтер:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s табылмады"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4919,7 +4916,7 @@ msgstr ""
 "Қолданылуы: %s команда [аргументтері]\n"
 "Команда - келесілердің біреуі:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4928,7 +4925,7 @@ msgstr ""
 "Аргументтер тым көп. \n"
 "Көбірек білу үшін \"%(basename)s help %(command)s\" енгізіңіз"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5102,7 +5099,7 @@ msgstr "Апта аяғы"
 msgid "Weekend!"
 msgstr "Демалыс!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5112,61 +5109,61 @@ msgstr ""
 "өшіру үшін http://jru.jabberstudio.org/ сияқты ростерді басқару құралдарын "
 "қолданыңыз"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "%s жіберген жазылудан бас тарту сұранымы"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Бөлме жойылған"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Оның орнына мына бөлмеге кіре аласыз: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Белгісіз SSL қатесі: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "%(nickname)s жіберген бір жаңа хабарлама"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "%s топ чатынан жаңа жеке хабарлама"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "%(nickname)s жазған"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "%(nickname)s жіберген жаңа хабарлама"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s күйін өзгерткен"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s желіге кірді"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s желіден шықты"
@@ -6291,11 +6288,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "MUC хабарламасы келген кезде ойналатын дыбыс."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "green"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "grocery"
 
@@ -6437,11 +6434,11 @@ msgstr "%s бума екен, алайда файл болуы керек еді
 msgid "Error: cannot open %s for reading"
 msgstr "Қате: оқу үшін %s ашу мүмкін емес"
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "көгілдір"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "тарих дерекқорын индекстарға көшірту"
 
@@ -8076,7 +8073,7 @@ msgid "Status:"
 msgstr "Күйі:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "Чат тарихын _логқа сақтау"
 
@@ -10340,6 +10337,11 @@ msgstr "Жіберілген контакттар:"
 msgid "Passphrase"
 msgstr "Пароль"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "JID не контакт атын енгізіңіз"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Іздеу:"
@@ -10352,7 +10354,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "К_онтакттардың күй өзгерісін тарихқа жазу"
@@ -10935,6 +10937,12 @@ msgstr "Соңғылар:"
 msgid "Plugin manager"
 msgstr "Плагин сәтсіз"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Ростер терезесін көрсетеді не жасырады"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "ipython терезесін көрсетеді не жасырады"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP тіркелгісі %s@%s"
@@ -12035,9 +12043,6 @@ msgstr "Плагин сәтсіз"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "JID не контакт атын енгізіңіз"
-
 #~ msgid "Groupchat Histories"
 #~ msgstr "Чат бөлмелер тарихы"
 
diff --git a/po/lt.po b/po/lt.po
index 807185298c..4ab639fe8d 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -461,34 +461,34 @@ msgstr ""
 msgid "Save Image as…"
 msgstr ""
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Turiu "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 #, fuzzy
 msgid "?Client:Unknown"
 msgstr "Klientas:"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr ""
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr ""
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr ""
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -497,7 +497,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -506,13 +506,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, 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:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -520,15 +520,15 @@ msgid ""
 msgstr ""
 "You and the contact are interested in each other's presence information"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " resource with priority "
 
@@ -858,7 +858,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr ""
 
@@ -868,7 +868,7 @@ msgid "Nickname"
 msgstr ""
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr ""
 
@@ -1170,6 +1170,10 @@ 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:1319
+msgid "Thanks"
+msgstr ""
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
@@ -1300,7 +1304,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Name"
@@ -1357,27 +1361,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "New Message"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "New Single Message"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "New Private Message"
 
@@ -1410,7 +1414,7 @@ msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
@@ -1772,7 +1776,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr ""
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is now %(status)s"
@@ -2139,6 +2143,7 @@ msgid "_Accept"
 msgstr "Priimti"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Jungtis"
 
@@ -2158,7 +2163,7 @@ msgstr "Apjungtos prieigos"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2531,48 +2536,52 @@ msgstr "History Manager"
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Naudoti piktogramą trėjuje (pranešimų panelės piktograma)"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Rodyti tik kontaktų _sąrašą"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Išplėstinis konfigūracijos redaktorius"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Kambario nustatymai"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Rodyti Visus Laukiančius Į_vykius"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Pops up a window with the next pending event"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
@@ -3147,44 +3156,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr ""
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Pokalbio istorija"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr ""
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr ""
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr ""
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr ""
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
@@ -3194,26 +3203,26 @@ msgstr "Subject: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Keisti Būklės Žinutę"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr ""
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Žymių valdymas"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "_sąraše"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Rodyk _Kontaktų Sąrašą"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
@@ -3346,7 +3355,6 @@ msgid "Re_gister"
 msgstr "Re_gister"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Jungtis"
@@ -3493,16 +3501,16 @@ msgstr ""
 msgid "Do you really want to close them all?"
 msgstr ""
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Group Chats"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Messages"
 
@@ -3596,7 +3604,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr ""
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr ""
@@ -3880,37 +3888,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "įprastas"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 
-#: gajim/gui_interface.py:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "OpenPGP Key Selection"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr ""
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
@@ -4466,65 +4474,57 @@ msgid "show help on command"
 msgstr "show help on command"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Shows or hides the roster window"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "account"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Changes the status of account or accounts"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "status"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, 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:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "message"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "status message"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4532,27 +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:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Changes the status of account or accounts"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "_Prioritetas:"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr ""
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 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:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4562,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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "message contents"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4594,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:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "subject"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "message subject"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "file"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "File path"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "key=value"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "key"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "name of the preference to be deleted"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML to send"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4715,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:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Change status"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr ""
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4733,19 +4733,15 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr ""
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4754,31 +4750,31 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4789,14 +4785,14 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -4968,7 +4964,7 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4977,61 +4973,61 @@ msgstr ""
 "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"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "unsubscribe request from %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Kambarys buvo sunaikintas"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "New Single Message from %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "New Private Message from group chat %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Changed Status"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Signed In"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Signed Out"
@@ -6064,11 +6060,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "green"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "grocery"
 
@@ -6213,11 +6209,11 @@ msgstr "%s is a directory but should be a file"
 msgid "Error: cannot open %s for reading"
 msgstr ""
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -7829,7 +7825,7 @@ msgid "Status:"
 msgstr "BÅ«klÄ—:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Registruoti pokalbio istorijÄ…"
 
@@ -10090,6 +10086,11 @@ msgstr "Siųsti kontaktus:"
 msgid "Passphrase"
 msgstr "Slapta frazÄ—"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Contact name"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Ieškoti:"
@@ -10102,7 +10103,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Registruoti asmenų būklės pakitimus"
@@ -10691,6 +10692,9 @@ msgstr "Nesenai:"
 msgid "Plugin manager"
 msgstr "Registracija nesÄ—kminga"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Shows or hides the roster window"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP prieiga %s@%s"
@@ -11318,10 +11322,6 @@ msgstr "Registracija nesÄ—kminga"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Pakviesti kontaktus į pokalbį (Ctrl+G)"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Contact name"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Groupchats"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 9419a364b2..3768b25b52 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -27,29 +27,28 @@ msgstr "Feil."
 
 #: gajim/chat_control_base.py:569
 msgid "_Undo"
-msgstr ""
+msgstr "_Angre"
 
 #: gajim/chat_control_base.py:577 gajim/profile_window.py:181
 #: gajim/conversation_textview.py:550
 msgid "_Clear"
-msgstr ""
+msgstr "_Tøm"
 
 #: gajim/chat_control_base.py:1167
 msgid "Really send file?"
 msgstr "Virkelig send fil?"
 
 #: gajim/chat_control_base.py:1168
-#, fuzzy, python-format
+#, python-format
 msgid "If you send a file to %s, he/she will know your real JID."
-msgstr ""
-"Dersom du sender en fil til %s, vil han/henne kjenne din ekte Jabber ID."
+msgstr "Dersom du sender en fil til %s, vil vedkommende kjenne din ekte JID."
 
 #: gajim/session.py:446 gajim/session.py:506
 msgid "Confirm these session options"
-msgstr "Bekreft disse sesjons valgene"
+msgstr "Bekreft disse økt-valgene"
 
 #: gajim/session.py:448
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "The remote client wants to negotiate a session with these features:\n"
 "\n"
@@ -57,11 +56,11 @@ msgid ""
 "\n"
 "Are these options acceptable?"
 msgstr ""
-"The andre klienten ønsker å forhandle en sesjon med disse funksjonene:\n"
+"Fjernklienten ønsker å forhandle frem ei økt med disse funksjonene:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tEr disse valgene akseptable?"
+"Kan du godta disse valgene?"
 
 #: gajim/session.py:508
 #, python-format
@@ -72,16 +71,15 @@ msgid ""
 "\n"
 "Continue with the session?"
 msgstr ""
-"The andre klienten valgte disse valgene:\n"
+"Fjernklientene valgte følgende:\n"
 "\n"
 "%s\n"
 "\n"
-"Fortsett med sesjonen?"
+"Fortsett økta?"
 
 #: gajim/session.py:511
-#, fuzzy
 msgid "Always accept for this contact"
-msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
+msgstr "Alltid godta for denne kontakten"
 
 #: gajim/filetransfers_window.py:89
 msgid "File"
@@ -113,7 +111,7 @@ msgstr "Du"
 #: gajim/filetransfers_window.py:234
 #, python-format
 msgid "Sender: %s"
-msgstr "Sender: %s"
+msgstr "Avsender: %s"
 
 #: gajim/filetransfers_window.py:235 gajim/filetransfers_window.py:762
 #: gajim/tooltips.py:654
@@ -127,36 +125,35 @@ msgstr "Lagret i: %s"
 
 #: gajim/filetransfers_window.py:248 gajim/chat_control.py:1600
 msgid "File transfer completed"
-msgstr "Fil overføring komplett"
+msgstr "Filoverføring fullført"
 
 #: gajim/filetransfers_window.py:250 gajim/chat_control.py:1604
-#, fuzzy
 msgid "Open _Containing Folder"
-msgstr "_Ã…pne Foreldre Katalog"
+msgstr "Ã…pne _inneholdende mappe"
 
 #: gajim/filetransfers_window.py:263 gajim/filetransfers_window.py:270
 #: gajim/chat_control.py:1659
 msgid "File transfer cancelled"
-msgstr "Fil overføring avbrutt"
+msgstr "Filoverføring avbrutt"
 
 #: 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."
+msgstr "Tilkoblingen med likemann kan ikke opprettes."
 
 #: gajim/filetransfers_window.py:280
 #, python-format
 msgid "Recipient: %s"
-msgstr "Mottaker:  %s"
+msgstr "Mottaker: %s"
 
 #: gajim/filetransfers_window.py:282
 #, python-format
 msgid "Error message: %s"
-msgstr "Feil melding: %s"
+msgstr "Feilmelding: %s"
 
 #: gajim/filetransfers_window.py:283 gajim/chat_control.py:1656
 msgid "File transfer stopped"
-msgstr "Fil overføring stoppet"
+msgstr "Filoverføring stoppet"
 
 #: gajim/filetransfers_window.py:319
 #, python-format
@@ -165,11 +162,13 @@ msgid ""
 "the way.\n"
 "Do you want to download it again?"
 msgstr ""
+"Fila %(file)s har blitt mottatt, men den later til å ha blitt skadet på "
+"veien.\n"
+"Ønsker du å laste den ned igjen?"
 
 #: gajim/filetransfers_window.py:345
-#, fuzzy
 msgid "Choose File to Send…"
-msgstr "Velg Fil for Sending..."
+msgstr "Velg fil å sende…"
 
 #: gajim/filetransfers_window.py:355
 msgid "_Send"
@@ -177,16 +176,15 @@ msgstr "_Send"
 
 #: gajim/filetransfers_window.py:362 gajim/tooltips.py:689
 msgid "Description: "
-msgstr "Beskrivelse:"
+msgstr "Beskrivelse: "
 
 #: gajim/filetransfers_window.py:375
-#, fuzzy
 msgid "Gajim can not read this file"
-msgstr "Gajim får ikke tilgang til filen"
+msgstr "Gajim kan ikke lese denne filen"
 
 #: gajim/filetransfers_window.py:376
 msgid "Another process is using this file."
-msgstr ""
+msgstr "En annen prosess bruker denne fila."
 
 #: gajim/filetransfers_window.py:421 gajim/gtkgui_helpers.py:485
 #, python-format
@@ -198,12 +196,12 @@ msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
-"En fil med dette navnet eksisterer og du har ikke rettigheter til å "
+"Ei fil med dette navnet finnes allerede og du har ikke tilgang til å "
 "overskrive den."
 
 #: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "This file already exists"
-msgstr "Denne filen finnes fra før"
+msgstr "Denne fila finnes allerede"
 
 #: gajim/filetransfers_window.py:439 gajim/gtkgui_helpers.py:490
 msgid "What do you want to do?"
@@ -212,16 +210,15 @@ msgstr "Hva ønsker du å gjøre?"
 #: gajim/filetransfers_window.py:450 gajim/gtkgui_helpers.py:497
 #, python-format
 msgid "Directory \"%s\" is not writable"
-msgstr "Katalogen \"%s\" er ikke skrivbar"
+msgstr "Mappa \"%s\" er ikke skrivbar"
 
 #: 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."
+msgstr "Du har ikke tilgang til å opprette filer i denne mappa."
 
 #: gajim/filetransfers_window.py:462
-#, fuzzy
 msgid "Save File as…"
-msgstr "Lagre Fil som..."
+msgstr "Lagre fil som…"
 
 #: gajim/filetransfers_window.py:482
 #, python-format
@@ -241,17 +238,15 @@ msgstr "Beskrivelse: %s"
 #: gajim/filetransfers_window.py:491
 #, python-format
 msgid "%s wants to send you a file:"
-msgstr "%s ønsker å sende deg en fil:"
+msgstr "%s ønsker å sende deg ei fil:"
 
 #: gajim/filetransfers_window.py:532
-#, fuzzy
 msgid "Checking file…"
-msgstr "Sender profil..."
+msgstr "Sjekker fil…"
 
 #: gajim/filetransfers_window.py:546
-#, fuzzy
 msgid "File error"
-msgstr "Fil Overføring Feilet"
+msgstr "Feil med fil"
 
 #: gajim/filetransfers_window.py:583
 #, python-format
@@ -265,7 +260,7 @@ msgstr "(%(filesize_unit)s/s)"
 
 #: gajim/filetransfers_window.py:729 gajim/filetransfers_window.py:732
 msgid "Invalid File"
-msgstr "Ugyldig Fil"
+msgstr "Ugyldig fil"
 
 #: gajim/filetransfers_window.py:729
 msgid "File: "
@@ -298,7 +293,7 @@ msgstr "Bonjour / Zeroconf"
 #: gajim/features_window.py:49
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
-"Serverløs samtale med automatisk oppdagede klienter på et lokalt nettverk."
+"Tjenerløs samtale med automatisk oppdagede klienter på lokalt nettverk."
 
 #: gajim/features_window.py:50
 msgid "Requires python-avahi."
@@ -309,6 +304,8 @@ msgid ""
 "Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
 "opensource/)."
 msgstr ""
+"Krever at pybonjour og bonjour-SDK kjører (https://developer.apple.com/"
+"opensource/)."
 
 #: gajim/features_window.py:52
 msgid "Command line"
@@ -316,7 +313,7 @@ msgstr "Kommandolinje"
 
 #: gajim/features_window.py:53
 msgid "A script to control Gajim via commandline."
-msgstr "Et script for å kontrollere Gajim via kommandolinjen."
+msgstr "Et skript for å kontrollere Gajim fra kommandolinjen."
 
 #: gajim/features_window.py:54
 msgid "Requires python-dbus."
@@ -325,29 +322,28 @@ msgstr "Krever python-dbus."
 #: gajim/features_window.py:55 gajim/features_window.py:83
 #: gajim/features_window.py:87
 msgid "Feature not available under Windows."
-msgstr "Funksjon ikke tilgjengelig i Windows."
+msgstr "Funksjonen er ikke tilgjengelig på Windows."
 
 #: gajim/features_window.py:56
-#, fuzzy
 msgid "OpenPGP message encryption"
-msgstr "OpenPGP meldingskryptering"
+msgstr "Meldingskryptering med OpenPGP"
 
 #: gajim/features_window.py:57
-#, fuzzy
 msgid "Ability to encrypting chat messages with OpenPGP."
-msgstr "Krypterer samtalemeldinger med gpg nøkler."
+msgstr "Mulighet for kryptering av sludremeldinger med OpenPGP."
 
 #: gajim/features_window.py:58
 msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
+"Krever gpg og python-gnupg (https://bitbucket.org/vinay.sajip/python-gnupg)."
 
 #: gajim/features_window.py:59
 msgid "Requires gpg.exe in PATH."
-msgstr ""
+msgstr "Krever gpg.exe i PATH."
 
 #: gajim/features_window.py:60
 msgid "Password encryption"
-msgstr "Passord kryptering"
+msgstr "Passordskryptering"
 
 #: gajim/features_window.py:61
 msgid "Passwords can be stored securely and not just in plaintext."
@@ -357,10 +353,11 @@ msgstr "Passord kan lagres sikkert og ikke bare i klartekst."
 msgid ""
 "Requires libsecret and a provider (such as GNOME Keyring and KSecretService)."
 msgstr ""
+"Krever libsecret og en tilbyder (som GNOME-nøkkelringen og KSecretService)."
 
 #: gajim/features_window.py:63
 msgid "On Windows the Windows Credential Vault is used."
-msgstr ""
+msgstr "PÃ¥ Windows brukes Windows Credential Vault."
 
 #: gajim/features_window.py:64
 msgid "Spell Checker"
@@ -368,12 +365,11 @@ msgstr "Stavekontroll"
 
 #: gajim/features_window.py:65
 msgid "Spellchecking of composed messages."
-msgstr "Stavekontroll av komponerte meldinger."
+msgstr "Stavekontroll av skrevne meldinger."
 
 #: gajim/features_window.py:66 gajim/features_window.py:67
-#, fuzzy
 msgid "Requires Gspell"
-msgstr "Krever libgtkspell."
+msgstr "Krever Gspell"
 
 #: gajim/features_window.py:68
 msgid "Automatic status"
@@ -381,11 +377,11 @@ msgstr "Automatisk status"
 
 #: gajim/features_window.py:69
 msgid "Ability to measure idle time, in order to set auto status."
-msgstr "Evnen til å måle inaktiv tid for å kunne sette auto status."
+msgstr "Evnen til å måle uvirksom tid for å kunne sette auto-status."
 
 #: gajim/features_window.py:70
 msgid "Requires libxss library."
-msgstr "Krever libxss biblioteket."
+msgstr "Krever libxss-biblioteket."
 
 #: gajim/features_window.py:71
 msgid "Requires python2.5."
@@ -393,7 +389,7 @@ msgstr "Krever python2.5."
 
 #: gajim/features_window.py:72
 msgid "End to End message encryption"
-msgstr "Ende til Ende meldingskryptering"
+msgstr "Ende-til-ende -meldingskryptering"
 
 #: gajim/features_window.py:73
 msgid "Encrypting chat messages."
@@ -405,15 +401,15 @@ msgstr "Krever python-crypto."
 
 #: gajim/features_window.py:76
 msgid "RST Generator"
-msgstr "RST Generator"
+msgstr "RST-generator"
 
 #: gajim/features_window.py:77
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
-"Generer XHTML ut fra RST kode (see http://docutils.sourceforge.net/docs/ref/"
-"rst/restructuredtext.html)."
+"Generer XHTML fra RST-kode (see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html)."
 
 #: gajim/features_window.py:78 gajim/features_window.py:79
 msgid "Requires python-docutils."
@@ -421,35 +417,36 @@ msgstr "Krever python-docutils."
 
 #: gajim/features_window.py:80 gajim/data/gui/preferences_window.ui:2421
 msgid "Audio / Video"
-msgstr ""
+msgstr "Lyd / Video"
 
 #: gajim/features_window.py:81
 msgid "Ability to start audio and video chat."
-msgstr ""
+msgstr "Evne til å starte lyd- og video-samtaler."
 
 #: gajim/features_window.py:82
 msgid ""
 "Requires gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav and "
 "gstreamer1.0-plugins-ugly."
 msgstr ""
+"Krever gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav og "
+"gstreamer1.0-plugins-ugly."
 
 #: gajim/features_window.py:84
 msgid "UPnP-IGD"
-msgstr ""
+msgstr "UPnP-IGD"
 
 #: gajim/features_window.py:85
 msgid "Ability to request your router to forward port for file transfer."
 msgstr ""
+"Evnen til å forespørre din ruter etter åpning av port for filoverføring."
 
 #: gajim/features_window.py:86
-#, fuzzy
 msgid "Requires gir1.2-gupnpigd-1.0."
-msgstr "Krever python-gnome2."
+msgstr "Krever gir1.2-gupnpigd-1.0."
 
 #: gajim/features_window.py:94
-#, fuzzy
 msgid "?features:Available"
-msgstr "Tilgjengelig"
+msgstr "?features:Tilgjengelig"
 
 #: gajim/features_window.py:101
 msgid "Feature"
@@ -457,95 +454,90 @@ msgstr "Funksjonalitet"
 
 #: gajim/gtkgui_helpers.py:259
 msgid "Error reading file:"
-msgstr "Feil under lesing av fil:"
+msgstr "Feil ved lesing av fil:"
 
 #: gajim/gtkgui_helpers.py:262
 msgid "Error parsing file:"
-msgstr "Feil under traversering av fil:"
+msgstr "Feil ved tolking av fil:"
 
 #: gajim/gtkgui_helpers.py:471
 msgid "Extension not supported"
-msgstr "Utvidelse ikke støttet"
+msgstr "Tillegget støttes ikke"
 
 #: 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?"
+msgstr "Bildet kan ikke lagres i %(type)s-format. Lagre som %(new_filename)s?"
 
 #: gajim/gtkgui_helpers.py:507
-#, fuzzy
 msgid "Save Image as…"
-msgstr "Lagre Bilde som..."
+msgstr "Lagre bilde som…"
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
-#, fuzzy
 msgid "Save _As"
-msgstr "Har"
+msgstr "Lagre _som"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
-msgstr "?Client:Ukjent"
+msgstr "?Klient:Ukjent"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
-msgstr "?Time:Ukjent"
+msgstr "?Tid:Ukjent"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
-msgstr ""
+msgstr "?Rolle i gruppesamtale:<b>Rolle:</b>"
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilhørighet:</b>"
 
-#: gajim/vcard.py:389
-#, fuzzy
+#: gajim/vcard.py:392
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr ""
-"Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
-"ikke interessert i hans/hennes status."
+"Denne kontakten er interessert i din tilstedeværelsesinformasjon, men du er "
+"ikke interessert i deres"
 
-#: gajim/vcard.py:391
-#, fuzzy
+#: gajim/vcard.py:394
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr ""
-"Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
-"hun er ikke interessert i din."
+"Du er interessert i denne kontaktens tilstedeværelsesinformasjon, men det er "
+"ikke gjensidig"
 
-#: gajim/vcard.py:393
-#, fuzzy
+#: gajim/vcard.py:396
 msgid "The contact and you want to exchange presence information"
 msgstr ""
-"Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
+"Dere er interessert i å utveksle hverandres tilstedeværelsesinformasjon"
 
-#: gajim/vcard.py:395
-#, fuzzy
+#: gajim/vcard.py:398
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr ""
-"Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
+"Dere er gjensidig uinteressert i hverandres tilstedeværelsesinformasjon"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
-msgstr "Du venter på kontaktens svar på din abonnerings forespørsel"
+msgstr ""
+"Du venter på at kontakten skal svare deg vedrørende forespørsel og abonnement"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
-msgstr "Det er ingen ventende abonnements forespørsler."
+msgstr "Ingen ventende abonnementsforespørsel."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
-msgstr " ressurs med prioritet"
+msgstr " ressurs med prioritet "
 
 #: gajim/options_dialog.py:383 gajim/dialogs.py:4767 gajim/dialogs.py:4809
 #: gajim/dialogs.py:4857 gajim/dialogs.py:4947
@@ -553,14 +545,12 @@ msgid "All files"
 msgstr "Alle filer"
 
 #: gajim/options_dialog.py:392
-#, fuzzy
 msgid "Clear File"
-msgstr "Vasker"
+msgstr "Tøm fil"
 
 #: gajim/options_dialog.py:474
-#, fuzzy
 msgid "Manage Proxies"
-msgstr "Behandle Proxy Profiler"
+msgstr "Behandle mellomtjenere"
 
 #: gajim/options_dialog.py:484 gajim/options_dialog.py:552
 #: gajim/options_dialog.py:573 gajim/dialogs.py:329 gajim/dialogs.py:331
@@ -574,18 +564,16 @@ msgid "None"
 msgstr "Ingen"
 
 #: gajim/options_dialog.py:506
-#, fuzzy
 msgid "Adjust to Status"
-msgstr "_Justér etter status"
+msgstr "Juster til status"
 
 #: gajim/options_dialog.py:518
 msgid "On"
-msgstr ""
+msgstr "PÃ¥"
 
 #: gajim/options_dialog.py:518
-#, fuzzy
 msgid "Off"
-msgstr "Frakoblet"
+msgstr "Av"
 
 #: gajim/options_dialog.py:556
 msgid "Failed to get secret keys"
@@ -593,19 +581,19 @@ msgstr "Klarte ikke å hente hemmelig nøkkel"
 
 #: gajim/options_dialog.py:557
 msgid "There is no OpenPGP secret key available."
-msgstr "Det er ingen OpenPGP hemmelig nøkkel tilgjengelig."
+msgstr "Det er ingen OpenPGP -hemmelig-nøkkel tilgjengelig."
 
 #: gajim/options_dialog.py:562
 msgid "OpenPGP Key Selection"
-msgstr "OpenPGP Nøkkel Valg"
+msgstr "Valg av OpenPGP-nøkkel"
 
 #: gajim/options_dialog.py:562
 msgid "Choose your OpenPGP key"
-msgstr "Velg din OpenPGP nøkkel"
+msgstr "Velg din OpenPGP-nøkkel"
 
 #: gajim/gui_menu_builder.py:100
 msgid "_New Group Chat"
-msgstr "_Ny Gruppe Samtale"
+msgstr "_Ny gruppesamtale"
 
 #: gajim/gui_menu_builder.py:292 gajim/gui_menu_builder.py:416
 #: gajim/dialogs.py:1117 gajim/dialogs.py:2317 gajim/dialogs.py:2346
@@ -620,35 +608,32 @@ msgstr "Ikke i kontaktliste"
 
 #: gajim/gui_menu_builder.py:431
 msgid "I would like to add you to my roster"
-msgstr "Jeg ønsker å legge deg til min kontaktliste"
+msgstr "Jeg ønsker å legge deg til på min kontaktliste"
 
 #: gajim/gui_menu_builder.py:508
-#, fuzzy
 msgid "Send Single _Message…"
-msgstr "Send _Melding"
+msgstr "Send enkelt_melding…"
 
 #: 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"
+msgstr "Send egendefiner_t status"
 
 #: gajim/gui_menu_builder.py:541
-#, fuzzy
 msgid "E_xecute Command…"
-msgstr "_Kjør Kommando"
+msgstr "K_jør Kommando…"
 
 #: gajim/gui_menu_builder.py:549
 msgid "_Manage Transport"
-msgstr "_Behandle Transporter"
+msgstr "_Behandle transport"
 
 #: gajim/gui_menu_builder.py:555
 msgid "_Modify Transport"
-msgstr "_Endre Transporter"
+msgstr "_Endre transport"
 
 #: gajim/gui_menu_builder.py:562 gajim/roster_window.py:5198
-#, fuzzy
 msgid "_Rename…"
-msgstr "_Gi Nytt Navn"
+msgstr "_Gi nytt navn…"
 
 #: gajim/gui_menu_builder.py:573 gajim/roster_window.py:5215
 #: gajim/roster_window.py:5330 gajim/data/gui/blocked_contacts_window.ui:52
@@ -673,173 +658,146 @@ msgid "_Information"
 msgstr "_Informasjon"
 
 #: gajim/gui_menu_builder.py:611
-#, fuzzy
 msgid "Send File..."
-msgstr "Send _Fil..."
+msgstr "Send fil…"
 
 #: gajim/gui_menu_builder.py:615
-#, fuzzy
 msgid "Invite Contacts"
-msgstr "Inviter _Kontakter"
+msgstr "Inviter _kontakter"
 
 #: gajim/gui_menu_builder.py:616
-#, fuzzy
 msgid "Add to Roster"
-msgstr "_Legg til Kontaktliste"
+msgstr "Legg til i kontaktliste"
 
 #: gajim/gui_menu_builder.py:617
 msgid "Audio Session"
-msgstr ""
+msgstr "Lydøkt"
 
 #: gajim/gui_menu_builder.py:618
 msgid "Video Session"
-msgstr ""
+msgstr "Videoøkt"
 
 #: gajim/gui_menu_builder.py:619
-#, fuzzy
 msgid "Information"
-msgstr "_Informasjon"
+msgstr "Informasjon"
 
 #: gajim/gui_menu_builder.py:620 gajim/gui_menu_builder.py:655
 #: gajim/data/gui/application_menu.ui:37
-#, fuzzy
 msgid "History"
-msgstr "_Historie"
+msgstr "Historikk"
 
 #: gajim/gui_menu_builder.py:644
-#, fuzzy
 msgid "Manage Room"
-msgstr "_Behandle Rom"
+msgstr "Behandle rom"
 
 #: gajim/gui_menu_builder.py:645
-#, fuzzy
 msgid "Change Subject"
-msgstr "Endre _Tittel..."
+msgstr "Endre emne"
 
 #: gajim/gui_menu_builder.py:646
-#, fuzzy
 msgid "Configure Room"
-msgstr "Konfigurer _Rom..."
+msgstr "Sett opp rom"
 
 #: gajim/gui_menu_builder.py:647
-#, fuzzy
 msgid "Destroy Room"
-msgstr "_Ødelegg Rom"
+msgstr "Ødelegg rom"
 
 #: gajim/gui_menu_builder.py:649
-#, fuzzy
 msgid "Change Nick"
-msgstr "Endre _Kallenavn..."
+msgstr "Endre kallenavn"
 
 #: gajim/gui_menu_builder.py:650
-#, fuzzy
 msgid "Bookmark Room"
-msgstr "Bokmerke dette rommet"
+msgstr "Bokmerk rommet"
 
 #: gajim/gui_menu_builder.py:651
-#, fuzzy
 msgid "Request Voice"
-msgstr "_Stemme"
+msgstr "Forespør stemme"
 
 #: gajim/gui_menu_builder.py:652 gajim/data/gui/gc_control_popup_menu.ui:72
-#, fuzzy
 msgid "Notify on all messages"
-msgstr "Forvalgte meldinger:"
+msgstr "Merknad ved alle meldinger"
 
 #: gajim/gui_menu_builder.py:653
-#, fuzzy
 msgid "Minimize on close"
-msgstr "_Minimer ved lukking"
+msgstr "Minimer ved lukking"
 
 #: gajim/gui_menu_builder.py:654 gajim/roster_window.py:5400
-#, fuzzy
 msgid "Execute command"
-msgstr "_Kjør Kommando"
+msgstr "Kjør kommando"
 
 #: gajim/gui_menu_builder.py:656
-#, fuzzy
 msgid "Disconnect"
-msgstr "_Koble ifra"
+msgstr "Koble fra"
 
 #: gajim/gui_menu_builder.py:685 gajim/gui_menu_builder.py:732
 msgid "Join Group Chat"
-msgstr "Bli med i Gruppesamtale"
+msgstr "Ta del i gruppesamtale"
 
 #: gajim/gui_menu_builder.py:731
-#, fuzzy
 msgid "Add Contact..."
-msgstr "_Legg til Kontakt..."
+msgstr "Legg til kontakt…"
 
 #: 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"
+msgstr "Profil"
 
 #: gajim/gui_menu_builder.py:734
-#, fuzzy
 msgid "Discover Services"
-msgstr "_Oppdag Tjenester"
+msgstr "Oppdag tjenester"
 
 #: gajim/gui_menu_builder.py:735
-#, fuzzy
 msgid "Send Single Message..."
-msgstr "_Send Enkeltmelding..."
+msgstr "Send enkeltmelding…"
 
 #: 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"
+msgstr "Arkiveringsinnstillinger"
 
 #: gajim/gui_menu_builder.py:738 gajim/history_sync.py:44
-#, fuzzy
 msgid "Synchronise History"
-msgstr "Synkroniser"
+msgstr "Synkroniser historikk"
 
 #: gajim/gui_menu_builder.py:739 gajim/dialogs.py:4544
 msgid "Privacy Lists"
-msgstr "Liste overUønskede"
+msgstr "Personvernslister"
 
 #: gajim/gui_menu_builder.py:740 gajim/server_info.py:37
-#, fuzzy
 msgid "Server Info"
-msgstr "Server"
+msgstr "Tjenerinfo"
 
 #: gajim/gui_menu_builder.py:741 gajim/data/gui/xml_console_window.ui:77
 msgid "XML Console"
-msgstr "XML Konsoll"
+msgstr "XML-konsoll"
 
 #: gajim/gui_menu_builder.py:743
-#, fuzzy
 msgid "Admin"
-msgstr "_Admin"
+msgstr "Admin"
 
 #: gajim/gui_menu_builder.py:744
-#, fuzzy
 msgid "Send Server Message..."
-msgstr "_Send Server Melding..."
+msgstr "_Send tjenermelding…"
 
 #: gajim/gui_menu_builder.py:745
 msgid "Set MOTD..."
-msgstr "Sett MOTD..."
+msgstr "Sett MOTD…"
 
 #: gajim/gui_menu_builder.py:746
 msgid "Update MOTD..."
-msgstr "Oppdater MOTD..."
+msgstr "Oppdater MOTD…"
 
 #: gajim/gui_menu_builder.py:747
-#, fuzzy
 msgid "Delete MOTD..."
-msgstr "Slett MFD (MOTD)"
+msgstr "Slett MFD (MOTD)…"
 
 #: gajim/gui_menu_builder.py:787
-#, fuzzy
 msgid "No Accounts available"
-msgstr "Ingen konto tilgjengelig"
+msgstr "Ingen kontoer tilgjengelig"
 
 #: 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
@@ -848,26 +806,24 @@ msgid "Accounts"
 msgstr "Kontoer"
 
 #: gajim/history_manager.py:56
-#, fuzzy
 msgid "Usage:"
-msgstr "melding"
+msgstr "Bruk:"
 
 #: gajim/history_manager.py:58
-#, fuzzy
 msgid "Options:"
-msgstr "_Uttrykksikoner:"
+msgstr "Valg:"
 
 #: gajim/history_manager.py:60
 msgid "Show this help message and exit"
-msgstr ""
+msgstr "Vis denne hjelpemeldingen og avslutt"
 
 #: gajim/history_manager.py:61
 msgid "Choose folder for logfile"
-msgstr ""
+msgstr "Velg mappe for loggføring"
 
 #: gajim/history_manager.py:104
 msgid "Cannot find history logs database"
-msgstr "Kan ikke finne historisk logg database"
+msgstr "Finner ikke loggføringsdatabasen for historikk"
 
 #: gajim/history_manager.py:144 gajim/history_manager.py:195
 #: gajim/dialogs.py:3809 gajim/config.py:1631 gajim/disco.py:872
@@ -875,7 +831,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Dato"
 
@@ -885,22 +841,21 @@ msgid "Nickname"
 msgstr "Kallenavn"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Melding"
 
 #: gajim/history_manager.py:181 gajim/history_manager.py:214
 msgid "Subject"
-msgstr "Tittel"
+msgstr "Tema"
 
 #: 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)"
+msgstr "Ønsker du å renske opp i databasen? (FRARÅDES STERKT NÅR GAJIM KJØRER)"
 
 #: gajim/history_manager.py:242
-#, fuzzy
 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 "
@@ -908,121 +863,109 @@ msgid ""
 "\n"
 "In case you click YES, please wait…"
 msgstr ""
-"Normalt vil tildelt database plass ikke frigjøres, den vil bare be merket "
-"som ledig. Dersom du virkelig ønsker å redusere fil størrelsen klikker du "
-"JA, ellers klikker du NEI.\n"
+"Normalt vil tildelt databaseplass ikke frigjøres, den vil bare be merket som "
+"ledig. Dersom du virkelig ønsker å redusere filstørrelsen klikker du JA, "
+"ellers klikker du NEI.\n"
 "\n"
-"I tilfelle du klikker JA, vennligst vent..."
+"I tilfelle du klikker JA, vent..."
 
 #: gajim/history_manager.py:247
-#, fuzzy
 msgid "Database Cleanup"
-msgstr "Database feil"
+msgstr "Opprenskning av database"
 
 #: gajim/history_manager.py:462
-#, fuzzy
 msgid "Exporting History Logs…"
-msgstr "Eksporterer Historiske Logger..."
+msgstr "Eksporterer historikkloggføring…"
 
 #: 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"
+msgstr "%(who)s sa: %(message)s %(time)s\n"
 
 #: gajim/history_manager.py:576
-#, fuzzy, python-format
+#, python-format
 msgid "Do you wish to delete all correspondence with %(jid)s?"
-msgstr "Ønsker du virkelig å slette den valgte meldingen?"
+msgstr "Ønsker du virkelig å slette all kommunikasjon med %(jid)s?"
 
 #: 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?"
+msgstr "Ønsker du å slette all korrespondanse med valgte kontakter?"
 
 #: gajim/history_manager.py:582
-#, fuzzy
 msgid "This can not be undone."
-msgstr "Tjenesten ble ikke funnet"
+msgstr "Dette kan ikke angres."
 
 #: gajim/history_manager.py:584 gajim/history_manager.py:623
-#, fuzzy
 msgid "Deletion Confirmation"
-msgstr "Avbryt bekreftelse"
+msgstr "Bekreftelse av sletting"
 
 #: 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?"
+msgstr[0] "Ønsker du å slette valgt melding?"
+msgstr[1] "Ønsker du å slette valgte meldinger?"
 
 #: gajim/history_manager.py:621
 msgid "This is an irreversible operation."
-msgstr "Denne operasjonen kan ikke angres."
+msgstr "Dette kan ikke angres."
 
 #: gajim/profile_window.py:63
-#, fuzzy
 msgid "Retrieving profile…"
-msgstr "Henter profil..."
+msgstr "Henter profil…"
 
 #: gajim/profile_window.py:128
 msgid "Could not load image"
-msgstr "Kunne ikke laste bilde"
+msgstr "Kunne ikke laste inn bilde"
 
 #: gajim/profile_window.py:200
-#, fuzzy
 msgid "Wrong date format"
-msgstr "Kontaktinformasjon"
+msgstr "Feil datoformat"
 
 #: gajim/profile_window.py:201
-#, fuzzy
 msgid "Format of the date must be YYYY-MM-DD"
-msgstr "Format: YYYY-MM-DD"
+msgstr "Datoformatet må være YYYY-MM-DD"
 
 #: gajim/profile_window.py:261
 msgid "Information received"
-msgstr "Informasjon motatt"
+msgstr "Informasjon mottatt"
 
 #: 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"
+msgstr "Du er ikke tilkoblet tjeneren"
 
 #: 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."
+msgstr "Uten en tilkobling, kan du ikke offentliggjøre din kontaktinformasjon."
 
 #: gajim/profile_window.py:349
-#, fuzzy
 msgid "Sending profile…"
-msgstr "Sender profil..."
+msgstr "Sender profil…"
 
 #: gajim/profile_window.py:368
 msgid "Information NOT published"
-msgstr "Informasjon IKKE publisert"
+msgstr "Informasjon IKKE offentliggjort"
 
 #: gajim/profile_window.py:375
 msgid "vCard publication failed"
-msgstr "vCard publisering feilet"
+msgstr "vCard-publisering mislyktes"
 
 #: gajim/profile_window.py:376
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
-msgstr ""
-"Det skjedde en feil med publisering av din personlige informasjon, prøv "
-"igjen senere."
+msgstr "Feil under publisering av personlig informasjon, prøv igjen senere."
 
 #: gajim/dialogs.py:95
 #, python-format
 msgid "Contact name: <i>%s</i>"
-msgstr "Kontakt navn: <i>%s</i>"
+msgstr "Kontaktnavn: <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:2939
 #: gajim/roster_window.py:3953 gajim/roster_window.py:5237
@@ -1030,7 +973,7 @@ msgstr "Jabber ID: <i>%s</i>"
 #: gajim/common/contacts.py:137 gajim/data/gui/preferences_window.ui:569
 #: gajim/data/gui/shortcuts_window.ui:176
 msgid "General"
-msgstr "Generelle"
+msgstr "Generelt"
 
 #: gajim/dialogs.py:211
 msgid "Group"
@@ -1042,109 +985,106 @@ msgstr "I gruppen"
 
 #: gajim/dialogs.py:311
 msgid "KeyID"
-msgstr "NøkkelID"
+msgstr "Nøkkel-ID"
 
 #: gajim/dialogs.py:316
 msgid "Contact name"
-msgstr "Kontakt navn"
+msgstr "Kontaktnavn"
 
 #: gajim/dialogs.py:494
 msgid "Set Mood"
-msgstr "Sett Stemning"
+msgstr "Angi humør"
 
 #: gajim/dialogs.py:614
 #, python-format
 msgid "%s Status Message"
-msgstr "%s Status Melding"
+msgstr "%s Statusmelding"
 
 #: gajim/dialogs.py:628
 msgid "Status Message"
-msgstr "Status Melding"
+msgstr "Statusmelding"
 
 #: gajim/dialogs.py:818
 msgid "Overwrite Status Message?"
-msgstr "Overskriv Status Melding?"
+msgstr "Overskriv statusmelding?"
 
 #: gajim/dialogs.py:819
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
-"Dette navnet er allerede i bruk. Ønsker du å overskrive denne status "
-"meldingen?"
+"Dette navnet er allerede i bruk. Ønsker du å overskrive denne "
+"statusmeldingen?"
 
 #: gajim/dialogs.py:827
 msgid "Save as Preset Status Message"
-msgstr "Lagre som Forvalgt Status Melding"
+msgstr "Lagre som forvalgt statusmelding"
 
 #: gajim/dialogs.py:828
 msgid "Please type a name for this status message"
-msgstr "Vennligst skriv inn et navn for denne status meldingen"
+msgstr "Skriv inn et navn for denne statusmeldingen"
 
 #: gajim/dialogs.py:855
-#, fuzzy
 msgid "JID:"
-msgstr "Din JID:"
+msgstr "JID:"
 
 #: 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 ""
-"Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
+msgstr "Fyll inn dataene for kontakten du ønsker å legge til kontoen <b>%s</b>"
 
 #: gajim/dialogs.py:900
 msgid "Please fill in the data of the contact you want to add"
-msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
+msgstr "Fyll inn dataene til kontakten du ønsker å legge til"
 
 #: gajim/dialogs.py:1092 gajim/dialogs.py:1098 gajim/dialogs.py:1103
 msgid "Invalid User ID"
-msgstr "Ugyldig Bruker ID"
+msgstr "Ugyldig bruker-ID"
 
 #: gajim/dialogs.py:1099
 msgid "The user ID must not contain a resource."
-msgstr "Bruker IDen må ikke inneholde en ressurs."
+msgstr "Bruker-ID-en kan ikke inneholde en ressurs."
 
 #: gajim/dialogs.py:1104
 msgid "You cannot add yourself to your roster."
-msgstr "Du kan ikke legge til deg selv i din kontaktliste."
+msgstr "Du kan ikke legge til deg selv i egen kontaktliste."
 
 #: gajim/dialogs.py:1118
 msgid "Contact already in roster"
-msgstr "Kontakt allerede i kontaktlisten"
+msgstr "Kontakt allerede i kontaktliste"
 
 #: gajim/dialogs.py:1119
 msgid "This contact is already listed in your roster."
-msgstr "Kontakten er allerede listet  i din kontaktliste."
+msgstr "Kontakten er allerede opplistet i din kontaktliste."
 
 #: gajim/dialogs.py:1172 gajim/dialogs.py:1206
 msgid "User ID:"
-msgstr "Bruker ID:"
+msgstr "Bruker-ID:"
 
 #: gajim/dialogs.py:1272
-#, fuzzy
 msgid "Error while adding transport contact"
-msgstr "Feil ved tilføying av tjeneste. %s"
+msgstr "Feil ved tilføying av transportkontakt"
 
 #: gajim/dialogs.py:1273
 #, python-format
@@ -1153,72 +1093,77 @@ msgid ""
 "\n"
 "%(error)s"
 msgstr ""
+"En feil inntraff under tillegg av kontakt for transporten %(transport)s:\n"
+"\n"
+"%(error)s"
 
 #: gajim/dialogs.py:1305
-#, fuzzy
 msgid "A GTK+ XMPP client"
-msgstr "En GTK+ Jabber klient"
+msgstr "En GTK+ -XMPP-klient"
 
 #: gajim/dialogs.py:1306
-#, fuzzy, python-format
+#, python-format
 msgid "GTK+ Version: %s"
-msgstr "GTK+ Versjon:"
+msgstr "GTK+versjon: %s"
 
 #: gajim/dialogs.py:1307
-#, fuzzy, python-format
+#, python-format
 msgid "PyGObject Version: %s"
-msgstr "PyGTK Versjon:"
+msgstr "PyGTK-versjon: %s"
 
 #: gajim/dialogs.py:1308
 #, python-format
 msgid "python-nbxmpp Version: %s"
-msgstr ""
+msgstr "python-nbxmpp-version: %s"
 
 #: gajim/dialogs.py:1311
-#, fuzzy
 msgid "Current Developers"
-msgstr "Nåværende Utviklere:"
+msgstr "Nåværende utviklere"
 
 #: gajim/dialogs.py:1312
-#, fuzzy
 msgid "Past Developers"
-msgstr "Tidligere Utviklere:"
+msgstr "Tidligere utviklere"
 
 #: gajim/dialogs.py:1313
 msgid "Artists"
-msgstr ""
+msgstr "Artister"
 
 #: gajim/dialogs.py:1317
 msgid "Last but not least"
-msgstr ""
+msgstr "Sist men ikke minst"
 
 #: 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."
+msgstr "vi vil rette en takk til alle dem som lager installasjonspakker."
+
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Takknemlig"
 
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
-msgstr "Stian B. Barmen <stian@barmen.nu>"
+msgstr ""
+"Allan Nordhøy <epost@anotheragency.no>\n"
+"Stian B. Barmen <stian@barmen.nu>"
 
 #: gajim/dialogs.py:1485
-#, fuzzy, python-format
+#, python-format
 msgid "Dictionary for language \"%s\" not available"
-msgstr "Ordliste for språk %s er ikke tilgjengelig"
+msgstr "Ordliste for språket \"%s\" er ikke tilgjengelig"
 
 #: gajim/dialogs.py:1486
-#, fuzzy, python-format
+#, 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 ""
-"Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
-"språk ved å sette stavekontro_llspråk valget.\n"
+"Du må installere '%s'-ordbok for å bruke stavekontroll, eller velge et annet "
+"språk ved å sette speller_language -valget.\n"
 "\n"
-"Utheving av feilstavede ord vil ikke bli brukt"
+"Funksjonen for utheving av feilstavede ord vil ikke bli brukt"
 
 #: gajim/dialogs.py:1833 gajim/dialogs.py:1848 gajim/gui_interface.py:1508
 #: gajim/gui_interface.py:1550
@@ -1226,42 +1171,42 @@ msgid "Insecure connection"
 msgstr "Usikker tilkobling"
 
 #: gajim/dialogs.py:1834
-#, fuzzy, python-format
+#, 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 "
 "discouraged.\n"
 "Are you sure you want to do that?"
 msgstr ""
-"Du er i ferd med å sende passordet ditt over en usikkert tilkobling. Du "
-"burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
-"ønsker å fortsette?"
+"Du er i ferd med å koble til kontoen %(account)s (%(server)s) på usikkert "
+"vis. Dette betyr at samtaler vil foregå ukryptert, hvilket frarådes sterkt.\n"
+"Er du sikker på at du ønsker å gjøre dette?"
 
 #: 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"
+msgstr "Ja, jeg ønsker virkelig å koble til på usikkert vis"
 
 #: gajim/dialogs.py:1840
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
+"Gajim vil IKKE koble til, med mindre du huker av denne avkryssningsboksen"
 
 #: 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:1941
 msgid "_Resume"
-msgstr ""
+msgstr "_Fortsett"
 
 #: gajim/dialogs.py:1949
 msgid "Re_place"
-msgstr ""
+msgstr "Ers_tatt"
 
 #: gajim/dialogs.py:2152 gajim/config.py:2174
 #: gajim/command_system/implementation/standard.py:261
@@ -1269,46 +1214,42 @@ msgid "Invalid nickname"
 msgstr "Ugyldig kallenavn"
 
 #: gajim/dialogs.py:2153
-#, fuzzy
 msgid "The nickname contains invalid characters."
-msgstr "Kallenavnet inneholder ulovlige tegn"
+msgstr "Kallenavnet inneholder ugyldige tegn."
 
 #: gajim/dialogs.py:2275
 msgid "Subscription Request"
-msgstr "Abonnerings Forespørsel"
+msgstr "Abonnements-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"
+msgstr "Abonnementsforespørsel for konto %(account)s fra %(jid)s"
 
 #: gajim/dialogs.py:2287
 #, python-format
 msgid "Subscription request from %s"
-msgstr "Abonnerings ønske fra %s"
+msgstr "Abonneringsønske fra %s"
 
 #: gajim/dialogs.py:2358 gajim/data/gui/join_groupchat_window.ui:312
-#, fuzzy
 msgid "Join Groupchat"
-msgstr "Bli med i Gruppesamtale"
+msgstr "Ta del i gruppesludring"
 
 #: gajim/dialogs.py:2500
-#, fuzzy
 msgid "Invalid Room"
 msgstr "Ugyldig rom"
 
 #: gajim/dialogs.py:2501
 msgid "Please choose a room"
-msgstr ""
+msgstr "Velt et rom"
 
 #: gajim/dialogs.py:2513 gajim/dialogs.py:2520
 msgid "Invalid Nickname"
-msgstr "Ugyldig Kallenavn"
+msgstr "Ugyldig kallenavn"
 
 #: gajim/dialogs.py:2514
-#, fuzzy
 msgid "Please choose a nickname"
-msgstr "Vennligst lag et nytt rent tema med ditt ønskede navn."
+msgstr "Velg et kallenavn"
 
 #: gajim/dialogs.py:2526 gajim/dialogs.py:3486 gajim/config.py:2457
 #: gajim/dialog_messages.py:37 gajim/dialog_messages.py:42
@@ -1317,58 +1258,54 @@ msgstr "Ugyldig JID"
 
 #: 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."
+msgstr "Du kan ikke gå inn i en gruppesamtale uten å være tilkoblet."
 
 #: gajim/dialogs.py:2586 gajim/dialogs.py:2597
-#, fuzzy
 msgid "Wrong server"
-msgstr "Feil uri"
+msgstr "Feil tjener"
 
 #: gajim/dialogs.py:2587 gajim/dialogs.py:2598
-#, fuzzy, python-format
+#, python-format
 msgid "%s is not a groupchat server"
-msgstr "Dette er ikke en samtalegruppe"
+msgstr "%s er ikke en gruppesamtale-tjener"
 
 #: gajim/dialogs.py:2620
 msgid "Without a connection, you can not synchronise your contacts."
-msgstr "Du kan ikke synkronisere kontakter uten å være tilkoblet."
+msgstr "Du kan ikke flette kontakter uten å være tilkoblet."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Navn"
 
 #: gajim/dialogs.py:2634 gajim/data/gui/join_groupchat_window.ui:214
 msgid "Server"
-msgstr "Server"
+msgstr "Tjener"
 
 #: gajim/dialogs.py:2670
 msgid "This account is not connected to the server"
-msgstr "Denne kontoen er ikke tilkoblet til serveren"
+msgstr "Denne kontoen er ikke tilkoblet tjeneren"
 
 #: 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."
+msgstr "Du kan ikke flette med en konto uten å være tilkoblet."
 
 #: gajim/dialogs.py:2700
 msgid "Synchronise"
-msgstr "Synkroniser"
+msgstr "Flett"
 
 #: gajim/dialogs.py:2772
-#, fuzzy
 msgid "Start new Conversation"
-msgstr "Fortsettende samtale"
+msgstr "Start ny samtale"
 
 #: gajim/dialogs.py:3028
-#, fuzzy
 msgid "New Groupchat"
-msgstr "Ny Gruppesamtale"
+msgstr "Ny gruppesludring"
 
 #: gajim/dialogs.py:3030
-#, fuzzy
 msgid "New Contact"
-msgstr "Legg til ny Kontakt"
+msgstr "Ny kontakt"
 
 #: gajim/dialogs.py:3076
 msgid "Without a connection, you can not change your password."
@@ -1384,36 +1321,36 @@ msgstr "Du må skrive inn et passord."
 
 #: gajim/dialogs.py:3100
 msgid "Passwords do not match"
-msgstr "Passordene er ikke like"
+msgstr "Passordene samsvarer ikke"
 
 #: 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:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
-msgstr "Kontakt Logget PÃ¥"
+msgstr "En kontakt logget inn"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
-msgstr "Kontakt Logget Av"
+msgstr "En kontakt logget ut"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
-msgstr "Ny Melding"
+msgstr "Ny melding"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
-msgstr "Ny Melding"
+msgstr "Ny enkeltstående melding"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
-msgstr "Ny Privat Melding"
+msgstr "Ny privat melding"
 
 #: gajim/dialogs.py:3144
 msgid "New E-mail"
@@ -1421,46 +1358,46 @@ msgstr "Ny E-post"
 
 #: gajim/dialogs.py:3146 gajim/gui_interface.py:926 gajim/notify.py:93
 msgid "File Transfer Request"
-msgstr "Fil Overførings Forespørsel"
+msgstr "Filoverføringsforespørsel"
 
 #: 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"
+msgstr "Filoverføring feilet"
 
 #: 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"
+msgstr "Filoverføring fullført"
 
 #: 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"
+msgstr "Filoverføring stoppet"
 
 #: 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"
+msgstr "Invitasjon til gruppesamtale"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
-msgstr "Kontakt Endret Status"
+msgstr "En kontakt endret status"
 
 #: gajim/dialogs.py:3374
 #, python-format
 msgid "Single Message using account %s"
-msgstr "Enkelt Melding med konto %s"
+msgstr "Enkeltmelding ved bruk av kontoen %s"
 
 #: gajim/dialogs.py:3376
 #, python-format
 msgid "Single Message in account %s"
-msgstr "Enkelt Melding i konto %s"
+msgstr "Enkeltmelding i kontoen %s"
 
 #: gajim/dialogs.py:3378
 msgid "Single Message"
-msgstr "Melding"
+msgstr "Enkeltmelding"
 
 #: gajim/dialogs.py:3381
 #, python-format
@@ -1470,7 +1407,7 @@ msgstr "Send %s"
 #: gajim/dialogs.py:3404
 #, python-format
 msgid "Received %s"
-msgstr "Motatt %s"
+msgstr "Mottatt %s"
 
 #: gajim/dialogs.py:3427
 #, python-format
@@ -1484,12 +1421,12 @@ msgstr "Tilkobling ikke tilgjengelig"
 #: 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\"."
+msgstr "Sjekk at du er tilkoblet \"%s\"."
 
 #: 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."
+msgstr "Det er ikke mulig å sende en melding til %s, JID-en er ikke gyldig."
 
 #: gajim/dialogs.py:3510
 #, python-format
@@ -1502,45 +1439,41 @@ msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
 #: gajim/dialogs.py:3558 gajim/data/gui/shortcuts_window.ui:113
-#, fuzzy
 msgid "Clear"
-msgstr "Vasker"
+msgstr "Tøm"
 
 #: gajim/dialogs.py:3563
-#, fuzzy
 msgid "Filter"
-msgstr "Filter:"
+msgstr "Filter"
 
 #: gajim/dialogs.py:3568
-#, fuzzy
 msgid "XML Input"
-msgstr "<b>XML Input</b>"
+msgstr "XML-inndata"
 
 #: gajim/dialogs.py:3572
 msgid "Send"
 msgstr "Send"
 
 #: gajim/dialogs.py:3755
-#, fuzzy
 msgid "add"
-msgstr "Lei seg"
+msgstr "legg til"
 
 #: gajim/dialogs.py:3755
-#, fuzzy
 msgid "modify"
-msgstr "Endre"
+msgstr "endre"
 
 #: gajim/dialogs.py:3756
-#, fuzzy
 msgid "remove"
-msgstr "_Fjern"
+msgstr "fjern"
 
 #: gajim/dialogs.py:3785
-#, fuzzy, python-format
+#, 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. "
+msgstr ""
+"<b>%(jid)s</b> ønsker at du <b>%(action)s</b> noen kontakter i kontaktlisten "
+"din."
 
 #: gajim/dialogs.py:3801 gajim/dialogs.py:3847 gajim/accounts_window.py:44
 msgid "Add"
@@ -1561,75 +1494,70 @@ msgstr "Grupper"
 #: 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. "
+msgstr "%s anbefalte meg å legge deg til på min kontaktliste."
 
 #: gajim/dialogs.py:3937
-#, fuzzy, python-format
+#, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
-msgstr[0] "_Legg til kontakt"
-msgstr[1] "_Legg til kontakt"
+msgstr[0] "La til %d kontakt"
+msgstr[1] "La til %d kontakter"
 
 #: gajim/dialogs.py:3975
-#, fuzzy, python-format
+#, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
-msgstr[0] "Fjerner kontakt fra kontaktlisten"
-msgstr[1] "Fjerner kontakt fra kontaktlisten"
+msgstr[0] "Fjernet %d kontakt"
+msgstr[1] "Fjernet %d kontakter"
 
 #: gajim/dialogs.py:4001
 #, python-format
 msgid "Archiving Preferences for %s"
-msgstr ""
+msgstr "Arkiveringsinnstillinger for %s"
 
 #: gajim/dialogs.py:4039
 msgid "Success!"
-msgstr ""
+msgstr "Vellykket"
 
 #: gajim/dialogs.py:4039
-#, fuzzy
 msgid "Your Archiving Preferences have been saved!"
-msgstr "_Instillinger"
+msgstr "Dine arkiveringsinnstillinger har blitt lagret."
 
 #: gajim/dialogs.py:4055
 msgid "We got no response from the Server"
-msgstr ""
+msgstr "Fikk ikke noe svar fra tjeneren"
 
 #: gajim/dialogs.py:4057
-#, fuzzy
 msgid "We received an error: {}"
-msgstr "Tjenesten returnerte en feil."
+msgstr "Tjenesten returnerte en feil: {}"
 
 #: gajim/dialogs.py:4061
-#, fuzzy
 msgid "Error!"
-msgstr "Feil"
+msgstr "Feil!"
 
 #: gajim/dialogs.py:4120
-#, fuzzy
 msgid "Add JID"
-msgstr "Jabber ID"
+msgstr "Legg til JID"
 
 #: gajim/dialogs.py:4193
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
-msgstr "Liste over Uønskede <b><i>%s</i></b>"
+msgstr "Personvernsliste <b><i>%s</i></b>"
 
 #: gajim/dialogs.py:4197
 #, python-format
 msgid "Privacy List for %s"
-msgstr "Liste over Uønskede for %s"
+msgstr "Personvernsliste for %s"
 
 #: gajim/dialogs.py:4199 gajim/data/gui/privacy_list_window.ui:47
 msgid "Privacy List"
-msgstr "Liste over Utestengte"
+msgstr "Personverns-liste"
 
 #: 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"
+"Rekkefølge: %(order)s, handling: %(action)s, type: %(type)s, verdi: %(value)s"
 
 #: gajim/dialogs.py:4275
 #, python-format
@@ -1638,7 +1566,7 @@ msgstr "Rekkefølge: %(order)s, handling: %(action)s"
 
 #: gajim/dialogs.py:4329
 msgid "<b>Edit a rule</b>"
-msgstr "<b>Rediger en regel</b>"
+msgstr "<b>Endre en regel</b>"
 
 #: gajim/dialogs.py:4441
 msgid "<b>Add a rule</b>"
@@ -1647,15 +1575,15 @@ msgstr "<b>Legg til regel</b>"
 #: gajim/dialogs.py:4542
 #, python-format
 msgid "Privacy Lists for %s"
-msgstr "Liste over Uønskede for %s"
+msgstr "Personvernslister tilhørende %s"
 
 #: gajim/dialogs.py:4638
 msgid "Invalid List Name"
-msgstr "Listenavnet er Ugyldig"
+msgstr "Listenavnet er ugyldig"
 
 #: 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."
+msgstr "Du må skrive inn et navn for å lage en personvernsliste."
 
 #: gajim/dialogs.py:4675
 msgid "You are invited to a groupchat"
@@ -1681,15 +1609,15 @@ msgstr "Ønsker du å akseptere invitasjonen?"
 
 #: gajim/dialogs.py:4707
 msgid "Reason (if you decline):"
-msgstr ""
+msgstr "Grunn (hvis du avslår)"
 
 #: gajim/dialogs.py:4756
 msgid "Choose Client Cert #PCKS12"
-msgstr ""
+msgstr "Velg klientsertifikat #PCKS12"
 
 #: gajim/dialogs.py:4772 gajim/accounts_window.py:656
 msgid "PKCS12 Files"
-msgstr ""
+msgstr "PCKS12-filer"
 
 #: gajim/dialogs.py:4798
 msgid "Choose Sound"
@@ -1697,25 +1625,23 @@ msgstr "Velg Lyd"
 
 #: gajim/dialogs.py:4814
 msgid "Wav Sounds"
-msgstr "Wav Lyder"
+msgstr "Wav-lyder"
 
 #: gajim/dialogs.py:4844
 msgid "Choose Image"
-msgstr "Velg Bilde"
+msgstr "Velg bilde"
 
 #: gajim/dialogs.py:4862
 msgid "Images"
 msgstr "Bilder"
 
 #: gajim/dialogs.py:4933
-#, fuzzy
 msgid "Choose Archive"
-msgstr "Velg Bilde"
+msgstr "Velg arkiv"
 
 #: gajim/dialogs.py:4952
-#, fuzzy
 msgid "Zip files"
-msgstr "Alle filer"
+msgstr "Zip-filer"
 
 #: gajim/dialogs.py:4978
 #, python-format
@@ -1725,19 +1651,19 @@ msgstr "NÃ¥r %s blir:"
 #: gajim/dialogs.py:4980
 #, python-format
 msgid "Adding Special Notification for %s"
-msgstr "Legg til Spesiell Alarm for %s"
+msgstr "Legger til spesiell merknad for %s"
 
 #: gajim/dialogs.py:5220
 msgid "an audio and video"
-msgstr ""
+msgstr "en lyd og video"
 
 #: gajim/dialogs.py:5222
 msgid "an audio"
-msgstr ""
+msgstr "en lyd"
 
 #: gajim/dialogs.py:5224
 msgid "a video"
-msgstr ""
+msgstr "en video"
 
 #: gajim/dialogs.py:5228
 #, python-format
@@ -1745,11 +1671,13 @@ msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
+"%(contact)s ønsker å starte %(type)s økt med deg. Ønsker du å besvare denne "
+"forespørselen?"
 
 #: gajim/dialogs.py:5333 gajim/dialogs.py:5369
-#, fuzzy, python-format
+#, python-format
 msgid "Certificate for account %s"
-msgstr "for kontoen %s"
+msgstr "Sertifikat for kontoen %s"
 
 #: gajim/dialogs.py:5333
 #, python-format
@@ -1774,90 +1702,105 @@ msgid ""
 "\n"
 "SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
+"<b>Utstedt til:</b>\n"
+"Vanlig navn (CN): %(scn)s\n"
+"Organisasjon (O): %(sorg)s\n"
+"Organisasjonsenhet (OU): %(sou)s\n"
+"Serienummer: %(sn)s\n"
+"\n"
+"<b>Utstedt av:</b>\n"
+"Vanlig navn (CN): %(icn)s\n"
+"Organisasjon (O): %(iorg)s\n"
+"Organisasjonsenhet (OU): %(iou)s\n"
+"\n"
+"<b>Gyldighet:</b>\n"
+"Utstedt: %(io)s\n"
+"Utløper: %(eo)s\n"
+"\n"
+"<b>Fingeravtrykk</b>\n"
+"SHA-1 -fingeravtrykk: %(sha1)s\n"
+"\n"
+"SHA-256 -fingeravtrykk: %(sha256)s\n"
 
 #: gajim/dialogs.py:5380 gajim/gui_interface.py:1402
-#, fuzzy, python-format
+#, python-format
 msgid "SSL Certificate Verification for %s"
-msgstr "SSL sertifikats validering"
+msgstr "Bekreftelse av SSL-sertifikat for %s"
 
 #: gajim/dialogs.py:5381 gajim/dialogs.py:5398
 msgid "View cert…"
-msgstr ""
+msgstr "Vis sertifikat…"
 
 #: gajim/dialogs.py:5414 gajim/data/gui/application_menu.ui:32
-#, fuzzy
 msgid "File Transfer"
-msgstr "Fil Overføringer"
+msgstr "Filoverføring"
 
 #: gajim/dialogs.py:5438
 msgid "Requesting HTTP Upload Slot..."
-msgstr ""
+msgstr "Forespør HTTP-opplastingsplass…"
 
 #: gajim/dialogs.py:5442
 msgid "Uploading file via HTTP File Upload..."
-msgstr ""
+msgstr "Laster opp fil via HTTP-filopplasting…"
 
 #: gajim/dialogs.py:5446
-#, fuzzy
 msgid "Encrypting file..."
-msgstr "Kryptering avslått"
+msgstr "Krypterer fil…"
 
 #: 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"
+msgstr "%(nick)s går nå under navnet %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nå %(status)s"
 
 #: gajim/groupchat_control.py:247
 msgid "Sending private message failed"
-msgstr "Sending av privat melding feilet"
+msgstr "Forsendelse av privat melding mislyktes"
 
 #: 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."
+"Du er ikke lenger i gruppesamtalen \"%(room)s\", eller så har \"%(nick)s\" "
+"forlatt den."
 
 #: gajim/groupchat_control.py:636 gajim/chat_control.py:323
 #: gajim/chat_control.py:327
 msgid "HTTP File Upload"
-msgstr ""
+msgstr "HTTP-filopplasting"
 
 #: gajim/groupchat_control.py:638
-#, fuzzy
 msgid "HTTP File Upload not supported by your server"
-msgstr "Metakontakter lagring støttes ikke av din server"
+msgstr "HTTP-filopplasting støttes ikke av tjeneren din"
 
 #: gajim/groupchat_control.py:651 gajim/groupchat_control.py:2319
 msgid "Changing Subject"
-msgstr "Endrer Tittel"
+msgstr "Endrer tema"
 
 #: gajim/groupchat_control.py:652 gajim/groupchat_control.py:2320
 msgid "Please specify the new subject:"
-msgstr "Vennlist skriv inn ny tittel:"
+msgstr "Skriv inn nytt tema:"
 
 #: gajim/groupchat_control.py:659
 msgid "Changing Nickname"
-msgstr "Endrer Kallenavn"
+msgstr "Endrer kallenavn"
 
 #: gajim/groupchat_control.py:660
 msgid "Please specify the new nickname you want to use:"
-msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
+msgstr "Velg hvilket nye kallenavn du ønsker å bruke:"
 
 #: gajim/groupchat_control.py:677
-#, fuzzy
 msgid "Invalid group chat JID"
-msgstr "Ugyldig gruppesamtale Jabber ID"
+msgstr "Ugyldig gruppesludrings-JID"
 
 #: gajim/groupchat_control.py:678
-#, fuzzy
 msgid "The group chat JID has not allowed characters."
-msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
+msgstr "Gruppesludrings-JID-en inneholder ulovlige symboler."
 
 #: gajim/groupchat_control.py:684
 #, python-format
@@ -1865,88 +1808,82 @@ msgid "Destroying %s"
 msgstr "Ødelegger %s"
 
 #: gajim/groupchat_control.py:685
-#, fuzzy
 msgid ""
 "You are going to remove this room permanently.\n"
 "You may specify a reason below:"
 msgstr ""
-"Du kommer garantert til å ødelegge dette rommet.\n"
-"Du kan skrive en årsak under:"
+"Du er i ferd med å fjerne dette rommet for godt.\n"
+"Du kan oppgi årsak nedenfor:"
 
 #: gajim/groupchat_control.py:687
 msgid "You may also enter an alternate venue:"
-msgstr "Du kan også skrive et alternativt møtested:"
+msgstr "Du kan også skrive inn et alternativt møtested:"
 
 #: gajim/groupchat_control.py:864
 msgid "Insert Nickname"
-msgstr "Skriv inn Kallenavn"
+msgstr "Skriv inn kallenavn"
 
 #: gajim/groupchat_control.py:1015 gajim/chat_control.py:800
 msgid "and authenticated"
-msgstr "og autentisert"
+msgstr "og identitetsbekreftet"
 
 #: gajim/groupchat_control.py:1019 gajim/chat_control.py:804
 msgid "and NOT authenticated"
-msgstr "og IKKE autentisert"
+msgstr "og IKKE identitetsbekreftet"
 
 #: gajim/groupchat_control.py:1023 gajim/chat_control.py:808
-#, fuzzy, python-format
+#, 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."
+msgstr "%(type)s kryptering er aktiv %(authenticated)s."
 
 #: gajim/groupchat_control.py:1066
 msgid "Conversation with "
-msgstr "Samtale med"
+msgstr "Samtale med "
 
 #: gajim/groupchat_control.py:1068
 msgid "Continued conversation"
-msgstr "Fortsettende samtale"
+msgstr "Fortsatt samtale"
 
 #: gajim/groupchat_control.py:1426
-#, fuzzy, python-format
+#, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
-msgstr "%(jid)s har satt tittel til %(subject)s"
+msgstr "%(nick)s satt temaet til %(subject)s"
 
 #: 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"
+msgstr "Enhver samtaledeltager kan se hele JID-en din"
 
 #: gajim/groupchat_control.py:1452
-#, fuzzy
 msgid "Room now shows unavailable members"
-msgstr "Rommet viser nå utilgjengelig medlem"
+msgstr "Rommet viser nå utilgjengelige medlemmer"
 
 #: gajim/groupchat_control.py:1454
-#, fuzzy
 msgid "Room now does not show unavailable members"
-msgstr "rommet viser nå ikke utilgjengelige medlemmer"
+msgstr "Rommet viser nå utilgjengelige medlemmer"
 
 #: gajim/groupchat_control.py:1456
 msgid "A setting not related to privacy has been changed"
-msgstr ""
+msgstr "En innstilling som ikke har med personvern å gjøre har blitt endret"
 
 #: gajim/groupchat_control.py:1460
 msgid "Room logging is now enabled"
-msgstr "Rom logging er nå påslått"
+msgstr "Romlogging er nå aktivert"
 
 #: gajim/groupchat_control.py:1462
 msgid "Room logging is now disabled"
-msgstr "Rom logging er nå avslått"
+msgstr "Romlogging er nå avskrudd"
 
 #: gajim/groupchat_control.py:1464
 msgid "Room is now non-anonymous"
-msgstr "Rommet er nå ikke-anonymisert"
+msgstr "Rommet er nå ikke-anonymt"
 
 #: gajim/groupchat_control.py:1467
 msgid "Room is now semi-anonymous"
-msgstr "Rommet er nå semi-anonymisert"
+msgstr "Rommet er nå semi-anonymt"
 
 #: gajim/groupchat_control.py:1470
-#, fuzzy
 msgid "Room is now fully anonymous"
-msgstr "Romet er nå full-anonymisert"
+msgstr "Rommet er nå helt anonymt"
 
 #: gajim/groupchat_control.py:1510 gajim/chat_control.py:1251
 #, python-format
@@ -1955,46 +1892,46 @@ msgstr "Pong! (%s s.)"
 
 #: gajim/groupchat_control.py:1727 gajim/groupchat_control.py:2347
 #: gajim/roster_window.py:3129 gajim/gui_interface.py:621
-#, fuzzy, python-format
+#, python-format
 msgid "%(jid)s has been invited in this room"
-msgstr "%(nick)s har blitt fjernet fra rommet (%(reason)s)"
+msgstr "%(jid)s har blitt invitert til dette rommet"
 
 #: gajim/groupchat_control.py:1739
 msgid "Room logging is enabled"
-msgstr "Rom logging er påslått"
+msgstr "Romlogging er nå påskrudd"
 
 #: gajim/groupchat_control.py:1741
 msgid "A new room has been created"
-msgstr "Et nytt rom har blitt laget"
+msgstr "Et nytt rom har blitt opprettet"
 
 #: gajim/groupchat_control.py:1744
 msgid "The server has assigned or modified your roomnick"
-msgstr "Serveren har satt eller endret ditt rom kallenavn"
+msgstr "Tjeneren har tildelt eller endret ditt kallenavn i dette rommet"
 
 #: gajim/groupchat_control.py:1750
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
-msgstr "%(nick)s har blitt utvist: %(reason)s"
+msgstr "%(nick)s har blitt kastet ut: %(reason)s"
 
 #: 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"
+msgstr "%(nick)s har blitt kastet ut av %(who)s: %(reason)s"
 
 #: gajim/groupchat_control.py:1762
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
-msgstr "%(nick)s er blitt uønsket: %(reason)s"
+msgstr "%(nick)s har blitt bannlyst: %(reason)s"
 
 #: 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"
+msgstr "%(nick)s har blitt bannlyst av %(who)s: %(reason)s"
 
 #: 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"
+msgstr "Du går nå under navnet %s"
 
 #: gajim/groupchat_control.py:1814 gajim/groupchat_control.py:1819
 #: gajim/groupchat_control.py:1825
@@ -2008,22 +1945,22 @@ msgstr "tilhørighet endret"
 
 #: gajim/groupchat_control.py:1821
 msgid "room configuration changed to members-only"
-msgstr "rom konfigurasjon er endret til kun-for-medlemmer"
+msgstr "romoppsett endret til kun medlemmer"
 
 #: gajim/groupchat_control.py:1827
 msgid "system shutdown"
-msgstr "systemet slår seg av"
+msgstr "nedstenging av systemet"
 
 #: 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"
+"** Tilhørighet for %(nick)s har blitt satt til %(affiliation)s av %(actor)s"
 
 #: 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"
+msgstr "** Tilhørigheten til %(nick)s har blitt satt til %(affiliation)s"
 
 #: gajim/groupchat_control.py:1900
 #, python-format
@@ -2043,60 +1980,57 @@ msgstr "%s har dratt"
 #: gajim/groupchat_control.py:1939
 #, python-format
 msgid "%s has joined the group chat"
-msgstr "%s har blitt med i gruppesamtalen"
+msgstr "%s har tatt del i gruppesamtalen"
 
 #: 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\"?"
+msgstr "Er du sikker på at du vil forlate gruppesamtalen \"%s\"?"
 
 #: 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."
+"Hvis du lukker dette vinduet, vil du bli frakoblet fra denne gruppesamtalen."
 
 #: gajim/groupchat_control.py:2498
 #, python-format
 msgid "Kicking %s"
-msgstr "Utkasting %s"
+msgstr "Kaster ut %s"
 
 #: gajim/groupchat_control.py:2499 gajim/groupchat_control.py:2795
 msgid "You may specify a reason below:"
-msgstr "Du kan spesifisere grunn under:"
+msgstr "Du kan oppgi en grunn nedenfor:"
 
 #: gajim/groupchat_control.py:2794
 #, python-format
 msgid "Banning %s"
-msgstr "Utvise %s"
+msgstr "Bannlyser %s"
 
 #: gajim/chat_control.py:325 gajim/chat_control.py:329
-#, fuzzy
 msgid "Jingle File Transfer"
-msgstr "Fil Overføringer"
+msgstr "Jingle-filoverføring"
 
 #: gajim/chat_control.py:331
-#, fuzzy
 msgid "No File Transfer available"
-msgstr "Fil Overføringer"
+msgstr "Ingen filoverføringer tilgjengelig"
 
 #: gajim/chat_control.py:392
 msgid "Show a list of formattings"
-msgstr "Vis en liste over formatteringer"
+msgstr "Vis formateringsliste"
 
 #: gajim/chat_control.py:396
 msgid "Formatting is not available so long as GPG is active"
-msgstr ""
+msgstr "Formatering er ikke tilgjengelig så lenge GPG er aktivt"
 
 #: gajim/chat_control.py:399
-#, fuzzy
 msgid "This contact does not support HTML"
-msgstr "Denne kontakten støtter ikke filoverføring."
+msgstr "Denne kontakten støtter ikke HTML"
 
 #: gajim/chat_control.py:511
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
-msgstr ""
+msgstr "%(type)s tilstand : %(state)s, grunn: %(reason)s"
 
 #: gajim/chat_control.py:652
 #, python-format
@@ -2105,40 +2039,39 @@ msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
 #: gajim/chat_control.py:886
 msgid "Session negotiation cancelled"
-msgstr "Sesjons forhandlinger avbrutt"
+msgstr "Øktforhandlinger avbrutt"
 
 #: gajim/chat_control.py:896
 msgid "This session WILL be archived on server"
-msgstr ""
+msgstr "Denne økta VIL bli arkivert på tjeneren"
 
 #: gajim/chat_control.py:898
-#, fuzzy
 msgid "This session WILL NOT be archived on server"
-msgstr "Sesjonen VIL IKKE bli logget"
+msgstr "Denne økta VIL IKKE bli arkivert på tjeneren"
 
 #: gajim/chat_control.py:907
 msgid "This session is encrypted"
-msgstr "Denne sesjonen er kryptert"
+msgstr "Denne økta er kryptert"
 
 #: gajim/chat_control.py:910
 msgid " and WILL be logged"
-msgstr "og VIL bli logget"
+msgstr " og VIL bli logget"
 
 #: gajim/chat_control.py:912
 msgid " and WILL NOT be logged"
-msgstr "og VIL IKKE bli logget"
+msgstr " og VIL IKKE bli logget"
 
 #: gajim/chat_control.py:917
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
-"Kontaktens identitet ikke bekreftet. Klikk på skjold knappen for flere "
+"Kontaktens identitet er ikke bekreftet. Klikk på skjold-knappen for flere "
 "detaljer."
 
 #: gajim/chat_control.py:919
 msgid "E2E encryption disabled"
-msgstr "E2E kryptering avslått"
+msgstr "Ende-til-ende -kryptering avslått"
 
 #: gajim/chat_control.py:1218
 #, python-format
@@ -2150,8 +2083,7 @@ msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
-"Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
-"mistet."
+"Dersom du lukker vinduet og du har slått av historikk, vil meldingen gå tapt."
 
 #: gajim/chat_control.py:1363
 #, python-format
@@ -2159,7 +2091,7 @@ msgid ""
 "Subject: %(subject)s\n"
 "%(message)s"
 msgstr ""
-"Tittel: %(subject)s\n"
+"Emne: %(subject)s\n"
 "%(message)s"
 
 #: gajim/chat_control.py:1477 gajim/gui_interface.py:1194
@@ -2168,8 +2100,8 @@ msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
-"Ikke mulig å dekryptere melding fra %s\n"
-"Den kan ha blitt endret."
+"Ikke mulig å dekryptere meldingen fra %s\n"
+"Den kan ha blitt tuklet med."
 
 #: gajim/chat_control.py:1515
 #, python-format
@@ -2177,28 +2109,26 @@ msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nå %(status)s"
 
 #: gajim/chat_control.py:1574
-#, fuzzy
 msgid "File transfer"
-msgstr "Fil Overføringer"
+msgstr "Filoverføring"
 
 #: gajim/chat_control.py:1577
-#, fuzzy
 msgid "Size"
-msgstr "Størrelse: "
+msgstr "Størrelse"
 
 #: gajim/chat_control.py:1579
-#, fuzzy
 msgid "_Accept"
-msgstr "Godkjenn"
+msgstr "_Godkjenn"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
-msgstr "_Bli med"
+msgstr "_Delta"
 
 #: 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"
+msgstr "Kontakten stoppet overføringen"
 
 #: gajim/chat_control.py:1654 gajim/roster_window.py:1993
 #: gajim/gui_interface.py:1016
@@ -2207,11 +2137,11 @@ msgstr "Feil under åpning av fil"
 
 #: gajim/roster_window.py:273 gajim/roster_window.py:1074
 msgid "Merged accounts"
-msgstr "Samlede kontoer"
+msgstr "Flettede kontoer"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2227,40 +2157,37 @@ msgid "Transports"
 msgstr "Transporter"
 
 #: gajim/roster_window.py:2045
-#, fuzzy
 msgid "Authorization sent"
-msgstr "Godkjenning har blitt sendt"
+msgstr "Godkjenning sendt"
 
 #: gajim/roster_window.py:2046
-#, fuzzy, python-format
+#, python-format
 msgid "\"%s\" will now see your status."
-msgstr "NÃ¥ vil \"%s\" kunne se din status."
+msgstr "\"%s\" vil nå kunne se din status."
 
 #: gajim/roster_window.py:2069
 msgid "Subscription request has been sent"
-msgstr "Abonnerings forespørsel er sendt"
+msgstr "Abonnementsforespørselen har blitt sendt"
 
 #: 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."
+"Hvis \"%s\" godtar denne forespørselen vil du få kjennskap til vedkommendes "
+"status."
 
 #: gajim/roster_window.py:2084
-#, fuzzy
 msgid "Authorization removed"
-msgstr "Godkjenning har blitt fjernet"
+msgstr "Godkjenning fjernet"
 
 #: 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."
+msgstr "NÃ¥ vil \"%s\" se deg som frakoblet."
 
 #: gajim/roster_window.py:2109
-#, fuzzy
 msgid "OpenPGP is not usable"
-msgstr "GPG fungerer ikke"
+msgstr "OpenPGP kan ikke brukes"
 
 #: gajim/roster_window.py:2110
 #, python-format
@@ -2269,45 +2196,49 @@ msgid ""
 "Beware there is an incompatible python package called gnupg.\n"
 "You will be connected to %s without OpenPGP."
 msgstr ""
+"Gajim trenger python-gnupg >= 0.3.8\n"
+"Vær oppmerksom på at det er en ukompatibel Python-pakke kalt gnupg.\n"
+"Du vil kobles til %s uten OpenPGP."
 
 #: 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"
+msgstr "Du deltar i én eller flere gruppesamtaler"
 
 #: 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 ""
-"Endring av status til usynlig vil resultere i at du forlater disse gruppe "
-"samtalene. Er du sikker på at du ønsker å bli usynlig?"
+"Endring av status til usynlig vil medføre frakobling fra de gruppesamtalene. "
+"Er du sikker på at du vil bli usynlig?"
 
 #: gajim/roster_window.py:2346
 msgid "desync'ed"
-msgstr "ute av synk"
+msgstr "usynkronisert"
 
 #: gajim/roster_window.py:2416
 msgid "Really quit Gajim?"
-msgstr "Virkelig avslutte Gajim?"
+msgstr "Avslutt Gajim?"
 
 #: gajim/roster_window.py:2417
 msgid "Are you sure you want to quit Gajim?"
-msgstr "Er du sikker på at du vil avslutte Gajim?"
+msgstr "Bekreft lukking av Gajim."
 
 #: gajim/roster_window.py:2418
 msgid "Always close Gajim"
 msgstr "Alltid lukk Gajim"
 
 #: gajim/roster_window.py:2505
-#, fuzzy
 msgid "You have running file transfers"
-msgstr "Avbryt filoverføring"
+msgstr "Du har filoverføringer underveis"
 
 #: 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 ""
+"Hvis du avslutter nå, vil fil(ene) som er underveis bli stoppet. Ønsker du "
+"fremdeles å avslutte?"
 
 #: gajim/roster_window.py:2537 gajim/roster_window.py:2828
 msgid "You have unread messages"
@@ -2318,8 +2249,8 @@ msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr ""
-"Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
-"historikk påslått og kontakten er i kontaktlisten."
+"Meldinger vil kun være tilgjengelig for senere lesning hvis du har historikk "
+"påskrudd og kontakten er å finne på din kontaktliste."
 
 #: gajim/roster_window.py:2829
 msgid "You must read them before removing this transport."
@@ -2328,19 +2259,19 @@ msgstr "Du må lese dem før du fjerner denne transporten."
 #: gajim/roster_window.py:2832
 #, python-format
 msgid "Transport \"%s\" will be removed"
-msgstr "Transport \"%s\" vil bli fjernet"
+msgstr "Transporten \"%s\" vil bli fjernet"
 
 #: gajim/roster_window.py:2833
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
-"Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
+"Du vil ikke lenger kunne sende og motta meldinger fra kontakter som bruker "
 "denne transporten."
 
 #: gajim/roster_window.py:2836
 msgid "Transports will be removed"
-msgstr "Transportene vil bli fjernet"
+msgstr "Transporter vil bli fjernet"
 
 #: gajim/roster_window.py:2841
 #, python-format
@@ -2348,103 +2279,99 @@ msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr ""
-"Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
-"transportene: %s"
+"Du vil ikke lenger kunne sende og motta meldinger til kontakter fra disse "
+"transporten: %s"
 
 #: 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?"
+"Du er i ferd med å blokkere en kontakt. Er du sikker på at du vil fortsette?"
 
 #: gajim/roster_window.py:2894
-#, fuzzy
 msgid ""
 "This contact will see you offline and you will not receive messages it sends "
 "you."
 msgstr ""
-"Denne kontakten vil se deg som frakoblet og du vil ikke motta meldinger han "
-"sender deg."
+"Denne kontakten vil se deg som frakoblet og du vil ikke motta meldinger "
+"vedkommende sender deg."
 
 #: gajim/roster_window.py:2934
 msgid "Rename Contact"
-msgstr "Omdøpe Kontakt"
+msgstr "Gi kontakt nytt navn"
 
 #: gajim/roster_window.py:2935
 #, python-format
 msgid "Enter a new nickname for contact %s"
-msgstr "Skriv inn et nytt kallenavn for kontakt %s"
+msgstr "Skriv inn kallenavn for kontakten %s"
 
 #: gajim/roster_window.py:2942
 msgid "Rename Group"
-msgstr "Omdøpe Gruppe"
+msgstr "Gi gruppe nytt navn"
 
 #: gajim/roster_window.py:2943
 #, python-format
 msgid "Enter a new name for group %s"
-msgstr "Skriv inn nytt navn for gruppe %s"
+msgstr "Skriv inn nytt navn på gruppen %s"
 
 #: gajim/roster_window.py:2988
 msgid "Remove Group"
-msgstr "Fjern Gruppe"
+msgstr "Fjern gruppe"
 
 #: 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?"
+msgstr "Ønsker du å fjerne gruppen %s fra kontaktlista?"
 
 #: 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"
+msgstr "Fjern også alle kontaktene i denne gruppa fra kontaktlista di"
 
 #: gajim/roster_window.py:3029
 msgid "Assign OpenPGP Key"
-msgstr "Tilegn OpenPGP Nøkkel"
+msgstr "Tildel OpenPGP-nøkkel"
 
 #: gajim/roster_window.py:3030
 msgid "Select a key to apply to the contact"
-msgstr "Velger en nøkkel til en kontakt"
+msgstr "Velg en nøkkel å tildele kontakten"
 
 #: gajim/roster_window.py:3436
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
-msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
+msgstr "Kontakten \"%s\" vil fjernes fra kontaktlista di"
 
 #: 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"
+"Du er i ferd med å fjerne \"%(name)s\" (%(jid)s) fra kontaktlista di.\n"
 
 #: gajim/roster_window.py:3443
-#, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in them "
 "always seeing you as offline."
 msgstr ""
-"Ved å fjerne disse kontaktene:%s\n"
-"fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
-"frakoblet."
+"Ved å fjerne disse kontaktene fjerner du også autorisasjonen, noe som gjør "
+"at de alltid vil se deg som frakoblet."
 
 #: gajim/roster_window.py:3449
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
 #: 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 ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
-"at han eller henne alltid vil se deg som frakoblet."
+"at vedkommende alltid vil se deg som frakoblet."
 
 #: 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"
+msgstr "Jeg ønsker at kontakten skal kunne se min status etter fjerning"
 
 #: gajim/roster_window.py:3460
 msgid "Contacts will be removed from your roster"
-msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
+msgstr "Kontakter vil bli fjernes fra din kontaktliste"
 
 #: gajim/roster_window.py:3465
 #, python-format
@@ -2453,25 +2380,24 @@ msgid ""
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 "Ved å fjerne disse kontaktene:%s\n"
-"fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
+"fjerner du også godkjenningen, noe som medfører at de alltid ser deg som "
 "frakoblet."
 
 #: gajim/roster_window.py:3523
-#, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
 msgstr ""
-"Du skal til å sende en individuell status. Er du sikker på at du ønsker å "
+"Du er i ferd med å sende en egendefinert status. Er du sikker på at du vil "
 "fortsette?"
 
 #: gajim/roster_window.py:3525
-#, fuzzy, python-format
+#, 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 ""
 "Denne kontakten vil midlertidig se deg som %(status)s, men bare til du "
-"endrer status igjen. Da vil han se din nye globale status. "
+"endrer status igjen. Da vil vedkommende se din nye globale status."
 
 #: gajim/roster_window.py:3544
 msgid "No account available"
@@ -2479,93 +2405,89 @@ msgstr "Ingen konto tilgjengelig"
 
 #: 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."
+msgstr "Du må opprette en konto før du kan føre samtaler med andre kontakter."
 
 #: 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"
+msgstr "Du kan ikke ta del i en gruppesamtale når du er usynlig"
 
 #: gajim/roster_window.py:4178
 msgid "Metacontacts storage not supported by your server"
-msgstr "Metakontakter lagring støttes ikke av din server"
+msgstr "Du mangler støtte for lagring av metakontakter på tjeneren din"
 
 #: gajim/roster_window.py:4180
-#, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
-"Din server støtter ikke lagring av metakontakt informasjon, så denne "
-"informasjonen vil ikke bli lagret til neste tilkobling."
+"Tjeneren din støtter ikke lagring av metakontaktinformasjon. Denne "
+"informasjonen vil ikke være lagret neste gang du kobler til."
 
 #: 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?"
+"Du er i ferd med å opprette en metakontakt. Er du sikker på at du vil "
+"fortsette?"
 
 #: gajim/roster_window.py:4278
-#, fuzzy
 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 ""
-"Metakontakter er en måte å omgruppere flere kontakter på en linje. Generelt "
-"brukes dette når samme person har flere Jabber kontoer eller transport "
-"kontoer."
+"Metakontakter er en måte å omgruppere flere kontakter på én linje. Generelt "
+"brukes dette når samme person har flere XMPP- eller transport-kontoer."
 
 #: gajim/roster_window.py:4400
 msgid "Invalid file URI:"
-msgstr "Ugyldig fil URI:"
+msgstr "Ugyldig fil-URI:"
 
 #: 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[0] "Ønsker du å sende denne fila til %s:"
 msgstr[1] "Ønsker du å sende disse filene til %s:"
 
 #: gajim/roster_window.py:4552
-#, fuzzy, python-format
+#, python-format
 msgid "Send %(from)s to %(to)s"
-msgstr "Send %s til %s"
+msgstr "Send %(from)s til %(to)s"
 
 #: gajim/roster_window.py:4565
-#, fuzzy, python-format
+#, python-format
 msgid "Make %s first contact"
-msgstr "Gjør %s og %s metakontakter"
+msgstr "Gjør %s til første kontakt"
 
 #: gajim/roster_window.py:4570
-#, fuzzy, python-format
+#, python-format
 msgid "Make %(contact1)s and %(contact2)s metacontacts"
-msgstr "Gjør %s og %s metakontakter"
+msgstr "Gjør %(contact1)s og %(contact2)s til metakontakter"
 
 #: gajim/roster_window.py:4954 gajim/roster_window.py:5052
 msgid "_Change Status Message"
-msgstr "_Endre Status Melding"
+msgstr "_Endre statusmelding"
 
 #: gajim/roster_window.py:4974
 msgid "Publish Tune"
-msgstr "Publiser Sang"
+msgstr "Offentliggjør melodi"
 
 #: gajim/roster_window.py:4985
-#, fuzzy
 msgid "Publish Location"
-msgstr "Publiser Sang"
+msgstr "Offentliggjør plassering"
 
 #: gajim/roster_window.py:4997
-#, fuzzy
 msgid "Configure Services…"
-msgstr "Konfigurer Tjenester..."
+msgstr "Sett opp tjenester…"
 
 #: gajim/roster_window.py:5130
 msgid "_Maximize All"
-msgstr "_Maksimer Alle"
+msgstr "_Maksimer alle"
 
 #: gajim/roster_window.py:5137 gajim/roster_window.py:5299
 msgid "Send Group M_essage"
-msgstr "Send Gruppe M_elding"
+msgstr "Send gruppe_melding"
 
 #: gajim/roster_window.py:5144
 msgid "To all users"
@@ -2583,12 +2505,11 @@ msgstr "In_viter til"
 
 #: gajim/roster_window.py:5315
 msgid "_Manage Contacts"
-msgstr "_Behandle Kontakter"
+msgstr "_Behandle kontakter"
 
 #: gajim/roster_window.py:5321
-#, fuzzy
 msgid "Edit _Groups…"
-msgstr "Rediger _Grupper"
+msgstr "Rediger _grupper…"
 
 #: gajim/roster_window.py:5342 gajim/data/gui/filetransfers.ui:11
 #: gajim/data/gui/remove_account_window.ui:137
@@ -2597,111 +2518,107 @@ msgstr "_Fjern"
 
 #: gajim/roster_window.py:5380
 msgid "_Maximize"
-msgstr "_Maksimer"
+msgstr "__Maksimer"
 
 #: gajim/roster_window.py:5387
 msgid "_Reconnect"
-msgstr "_Koble til på nytt"
+msgstr "_Koble til på ny"
 
 #: gajim/roster_window.py:5392 gajim/data/gui/gc_control_popup_menu.ui:120
 msgid "_Disconnect"
-msgstr "_Koble ifra"
+msgstr "_Koble fra"
 
 #: 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"
+msgstr "_Historikk"
 
 #: gajim/roster_window.py:5484 gajim/data/gui/application_menu.ui:86
 msgid "History Manager"
-msgstr "Historikk Behandler"
+msgstr "Historikk-behandler"
 
 #: gajim/roster_window.py:5492
 msgid "_Join New Group Chat"
-msgstr "_Bli med i Gruppesamtale"
+msgstr "_Ta del i ny gruppesamtale"
 
-#: gajim/gajim.py:72
-#, fuzzy
+#: gajim/gajim.py:75
 msgid "Show the application's version"
-msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
+msgstr "Vis programversjon"
 
-#: gajim/gajim.py:75
-#, fuzzy
+#: gajim/gajim.py:78
 msgid "Show only critical errors"
-msgstr "Vis bare i _kontaktliste"
+msgstr "Bare vis kritiske feil"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
-msgstr ""
+msgstr "Del profilene helt (selv historikkdatabase og programtillegg)"
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
-msgstr ""
+msgstr "Skriv ut XML-stanza-er og annen feilrettingsinformasjon"
 
-#: gajim/gajim.py:86
-#, fuzzy
+#: gajim/gajim.py:89
 msgid "Use defined profile in configuration directory"
-msgstr "Avansert Konfigurasjons Editor"
+msgstr "Bruk definert profil i oppsettsmappe"
 
-#: gajim/gajim.py:90
-#, fuzzy
+#: gajim/gajim.py:93
 msgid "Set configuration directory"
-msgstr "Rom Instillinger"
+msgstr "Velg oppsettsmappe"
 
-#: gajim/gajim.py:93
-#, fuzzy
+#: gajim/gajim.py:96
 msgid "Configure logging system"
-msgstr "_Konfigurer"
+msgstr "Sett opp loggføringssystem"
 
-#: gajim/gajim.py:96
-#, fuzzy
+#: gajim/gajim.py:99
 msgid "Show all warnings"
-msgstr "Vis Alle _Handlinger som Venter"
+msgstr "Vis alle advarsler"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Viser et oppsprettsvindu med neste ventende hendelse"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
-msgstr "Database feil"
+msgstr "Database-feil"
 
 #: gajim/history_sync.py:217
-#, fuzzy
 msgid "How far back do you want to go?"
-msgstr "Hva ønsker du å gjøre?"
+msgstr "Hvor langt tilbake ønsker du å gå?"
 
 #: gajim/history_sync.py:222
 msgid "One Month"
-msgstr ""
+msgstr "Én måned"
 
 #: gajim/history_sync.py:223
 msgid "Three Months"
-msgstr ""
+msgstr "Tre måneder"
 
 #: gajim/history_sync.py:224
 msgid "One Year"
-msgstr ""
+msgstr "Ett år"
 
 #: gajim/history_sync.py:225
 msgid "Everything"
-msgstr ""
+msgstr "Alt"
 
 #: gajim/history_sync.py:254
-#, fuzzy
 msgid "Connecting..."
-msgstr "Kobler til"
+msgstr "Kobler til…"
 
 #: gajim/history_sync.py:266
-#, fuzzy, python-format
+#, python-format
 msgid "%(received)s of %(max)s"
-msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
+msgstr "%(received)s av %(max)s"
 
 #: gajim/history_sync.py:270
-#, fuzzy, python-format
+#, python-format
 msgid "Downloaded %s Messages"
-msgstr "Videresend uleste meldinger"
+msgstr "Lastet ned %s meldinger"
 
 #: gajim/history_sync.py:290
 #, python-brace-format
@@ -2711,6 +2628,10 @@ msgid ""
 "        {received} Messages downloaded.\n"
 "        "
 msgstr ""
+"\n"
+"        Fullførte synkronisering av historikk.\n"
+"        {received} meldinger lastet ned.\n"
+"        "
 
 #: gajim/history_sync.py:297
 msgid ""
@@ -2719,6 +2640,10 @@ msgid ""
 "        with the Archive.\n"
 "        "
 msgstr ""
+"\n"
+"        Gajim er synkronisert\n"
+"        med arkivet.\n"
+"        "
 
 #: gajim/history_sync.py:304
 msgid ""
@@ -2727,24 +2652,28 @@ msgid ""
 "        progress. Please try later.\n"
 "        "
 msgstr ""
+"\n"
+"        Det er allerede én synkronisering\n"
+"        underveis. Prøv igjen senere.\n"
+"        "
 
 #: gajim/config.py:156 gajim/config.py:626
 #: gajim/data/gui/preferences_window.ui:68
 #: gajim/data/gui/preferences_window.ui:85
 msgid "Disabled"
-msgstr "Deaktivert"
+msgstr "Avskrudd"
 
 #: gajim/config.py:421 gajim/config.py:425 gajim/config.py:1947
 msgid "Default"
-msgstr "Standard"
+msgstr "Forvalg"
 
 #: gajim/config.py:1138
 msgid "status message title"
-msgstr "status melding tittel"
+msgstr "status-meldingstittel"
 
 #: gajim/config.py:1139
 msgid "status message text"
-msgstr "status melding tekst"
+msgstr "statusmeldings-tekst"
 
 #: gajim/config.py:1527
 #, python-format
@@ -2758,19 +2687,19 @@ msgstr "Registrer til %s"
 
 #: gajim/config.py:1565
 msgid "Ban List"
-msgstr "Listen over Utestengte"
+msgstr "Liste over bannlyste"
 
 #: gajim/config.py:1566
 msgid "Member List"
-msgstr "Medlems Liste"
+msgstr "Medlemsliste"
 
 #: gajim/config.py:1566
 msgid "Owner List"
-msgstr "Eier Liste"
+msgstr "Eierliste"
 
 #: gajim/config.py:1567
 msgid "Administrator List"
-msgstr "Administrator Liste"
+msgstr "Administrator-liste"
 
 #: gajim/config.py:1641
 msgid "Reason"
@@ -2785,22 +2714,20 @@ msgid "Role"
 msgstr "Rolle"
 
 #: gajim/config.py:1680
-#, fuzzy
 msgid "Banning…"
-msgstr "Utvis..."
+msgstr "Bannlyser…"
 
 #: gajim/config.py:1682
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr ""
-"<b>Hvem ønsker du å utvise?</b>\n"
+"<b>Hvem ønsker du å bannlyse?</b>\n"
 "\n"
 
 #: gajim/config.py:1684
-#, fuzzy
 msgid "Adding Member…"
-msgstr "Legger til Medlem..."
+msgstr "Legger til medlem…"
 
 #: gajim/config.py:1685
 msgid ""
@@ -2811,9 +2738,8 @@ msgstr ""
 "\n"
 
 #: gajim/config.py:1687
-#, fuzzy
 msgid "Adding Owner…"
-msgstr "Legger til Eier..."
+msgstr "Legger til eier…"
 
 #: gajim/config.py:1688
 msgid ""
@@ -2824,9 +2750,8 @@ msgstr ""
 "\n"
 
 #: gajim/config.py:1690
-#, fuzzy
 msgid "Adding Administrator…"
-msgstr "Legger til Administrator..."
+msgstr "Legger til administrator…"
 
 #: gajim/config.py:1691
 msgid ""
@@ -2845,30 +2770,29 @@ msgid ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain)."
 msgstr ""
-"Can være en av følgende:\n"
-"1. bruker@domene/ressurs (bare den ressursen treffer).\n"
-"2. bruker@domene (alle ressurser treffer).\n"
-"3. domene/ressurs (bare den ressursen treffer).\n"
-"4. domene (domene selv treffer, samt treffer alle bruker@domene,\n"
+"Kan være en av følgende:\n"
+"1. bruker@domene/ressurs (bare den ressursen samsvarer).\n"
+"2. bruker@domene (enhver ressurs samsvarer).\n"
+"3. domene/ressurs (bare den ressursen samsvarer).\n"
+"4. domene (selve domenet samsvarer, sågar også enhver bruker@domene,\n"
 "domene/ressurs, eller adresser som inneholder et underdomene)."
 
 #: gajim/config.py:1792
 #, python-format
 msgid "Removing %s account"
-msgstr "Fjerner %s kontoen"
+msgstr "Fjerner kontoen %s"
 
 #: gajim/config.py:1807
-#, fuzzy
 msgid "Account is disabled"
-msgstr "Uttryksikoner avslått"
+msgstr "Konto avskrudd"
 
 #: gajim/config.py:1808
 msgid "To unregister from a server, account must be enabled."
-msgstr ""
+msgstr "For å avregistrere fra en tjener, må kontoen være påskrudd"
 
 #: gajim/config.py:1821 gajim/gui_interface.py:314 gajim/gui_interface.py:748
 msgid "Password Required"
-msgstr "Krever Passord"
+msgstr "Passord påkrevd"
 
 #: gajim/config.py:1822 gajim/gui_interface.py:733
 #, python-format
@@ -2882,46 +2806,44 @@ msgstr "Lagre passord"
 #: gajim/config.py:1833
 #, python-format
 msgid "Account \"%s\" is connected to the server"
-msgstr "Kontoen \"%s\" er tilkoblet til serveren"
+msgstr "Kontoen \"%s\" er tilkoblet tjeneren"
 
 #: gajim/config.py:1834
 msgid "If you remove it, the connection will be lost."
-msgstr "Dersom du fjerner den vil tilkoblingen mistes."
+msgstr "Dersom du fjerner den vil tilkoblingen feile."
 
 #: gajim/config.py:1848
-#, fuzzy, python-format
+#, python-format
 msgid "Connection to server %s failed"
-msgstr "Tilkobling til proxy feilet"
+msgstr "Tilkobling til tjeneren %s feilet"
 
 #: gajim/config.py:1849
-#, fuzzy
 msgid "What would you like to do?"
 msgstr "Hva ønsker du å gjøre?"
 
 #: gajim/config.py:1850
-#, fuzzy
 msgid "Remove only from Gajim"
-msgstr "Fjern kontoe _bare fra Gajim"
+msgstr "Bare fjern fra Gajim"
 
 #: gajim/config.py:1851
 msgid "Don't remove anything. I'll try again later"
-msgstr ""
+msgstr "Ikke fjern noe. Jeg vil prøve igjen senere"
 
 #: gajim/config.py:1947
 msgid "?print_status:All"
-msgstr "?print_status:Alle"
+msgstr "?print_status:Alt"
 
 #: gajim/config.py:1948
 msgid "Enter and leave only"
-msgstr "GÃ¥ inn og legg igjen bare"
+msgstr "Bare ta del og forlat"
 
 #: gajim/config.py:1949
 msgid "?print_status:None"
-msgstr "?print_status:Ingen"
+msgstr "?print_status:Ingenting"
 
 #: gajim/config.py:2015
 msgid "New Group Chat"
-msgstr "Ny Gruppesamtale"
+msgstr "Ny gruppesamtale"
 
 #: gajim/config.py:2051
 msgid "This bookmark has invalid data"
@@ -2930,16 +2852,16 @@ msgstr "Dette bokmerket har ugyldig innhold"
 #: gajim/config.py:2052
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Vennligst fyll inn server og rom feltene for å fjerne dette bokmerket."
+msgstr "Fyll inn tjener- og rom -felt eller fjern dette bokmerket."
 
 #: gajim/config.py:2175 gajim/config.py:2191 gajim/config.py:2202
 #: gajim/config.py:2230
 msgid "Character not allowed"
-msgstr "Tegn ikke lovlig"
+msgstr "Ulovlig tegn"
 
 #: gajim/config.py:2190 gajim/config.py:2201 gajim/config.py:2479
 msgid "Invalid server"
-msgstr "Ugyldig server"
+msgstr "Ugyldig tjener"
 
 #: gajim/config.py:2229
 msgid "Invalid room"
@@ -2955,8 +2877,8 @@ msgid ""
 "later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 msgstr ""
-"Du kan gjøre avanserte konto instillinger ved å trykke på Avansert knappen, "
-"eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
+"Du kan gjøre avanserte kontoinstillinger ved å trykke på Avansert-knappen, "
+"eller senere ved å klikke under Kontoer-menyvalget, under Rediger-menyen fra "
 "hovedvinduet."
 
 #: gajim/config.py:2399
@@ -2969,29 +2891,29 @@ msgstr "Ugyldig brukernavn"
 
 #: gajim/config.py:2439
 msgid "You must provide a username to configure this account."
-msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
+msgstr "Du må oppgi et brukernavn for å sette opp denne kontoen."
 
 #: gajim/config.py:2480
 msgid "Please provide a server on which you want to register."
-msgstr "Vennlist skriv inn serveren du ønsker å registrere."
+msgstr "Oppgi tjeneren du ønsker å registrere deg på."
 
 #: gajim/config.py:2503
 msgid "Invalid entry"
-msgstr "Ugyldig innlegg"
+msgstr "Ugyldig oppføring"
 
 #: gajim/config.py:2504
 msgid "Custom port must be a port number."
-msgstr "Egendefinert port må være et port nummer"
+msgstr "Egendefinert port må være et portnummer"
 
 #: gajim/config.py:2536 gajim/gui_interface.py:1357
 msgid "Certificate Already in File"
-msgstr "Sertifikat Allerede i Katalogen"
+msgstr "Sertifikatet finnes allerede i fila"
 
 #: 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 ""
-"Dette sertifikatet er allerede i filen %s, så det legges ikke til igjen."
+"Dette sertifikatet er allerede i fila %s, så det legges ikke til igjen."
 
 #: gajim/config.py:2630
 #, python-format
@@ -3002,14 +2924,14 @@ msgid ""
 "SSL Error: %(error)s\n"
 "Do you still want to connect to this server?"
 msgstr ""
-"<b>Sikkerehets Advarsel</b>\n"
+"<b>Sikkerehetsadvarsel</b>\n"
 "\n"
-"Ektheten til %(hostname)s SSL sertifkat kan være ugyldig.\n"
-"SSL Feil: %(error)s\n"
-"Ønsker du fortsatt å koble til denne serveren?"
+"Gyldigheten til %(hostname)s SSL-sertifkat kan være ugyldig.\n"
+"SSL-feil: %(error)s\n"
+"Ønsker du fortsatt å koble til denne tjeneren?"
 
 #: 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"
@@ -3018,8 +2940,10 @@ msgid ""
 "%(sha256)s"
 msgstr ""
 "Legg til dette sertifikatet i listen over tiltrodde sertifikater.\n"
-"SHA1 fingeravtrykk til sertifikatet:\n"
-"%s"
+"SHA-1 -fingeravtrykk av sertifikatet:\n"
+"%(sha1)s\n"
+"SHA-256 -fingeravtrykk av sertifikatet:\n"
+"%(sha256)s"
 
 #: gajim/config.py:2670 gajim/config.py:2704
 msgid "An error occurred during account creation"
@@ -3027,7 +2951,7 @@ msgstr "Det skjedde en feil under oppretting av kontoen"
 
 #: gajim/config.py:2767
 msgid "Account name is in use"
-msgstr "Konto navnet er i bruk"
+msgstr "Kontonavnet er i bruk"
 
 #: gajim/config.py:2768
 msgid "You already have an account using this name."
@@ -3035,67 +2959,66 @@ msgstr "Du har allerede en konto med dette navnet."
 
 #: gajim/config.py:2900
 msgid "PEP node was not removed"
-msgstr "PEP noden ble ikke fjernet"
+msgstr "PEP-noden ble ikke fjernet"
 
 #: gajim/config.py:2901
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
+msgstr "PEP-noden %(node)s ble ikke fjernet: %(message)s"
 
 #: gajim/config.py:2929
-#, fuzzy, python-format
+#, python-format
 msgid "Configure %s"
-msgstr "_Konfigurer"
+msgstr "Sett opp %s"
 
 #: gajim/config.py:2946 gajim/plugins/gui.py:95
 msgid "Active"
-msgstr "Aktiv"
+msgstr "Påslått"
 
 #: gajim/config.py:2954
 msgid "Event"
 msgstr "Hendelse"
 
 #: gajim/config.py:2988
-#, fuzzy
 msgid "Attention Message Received"
-msgstr "Første Melding Motatt"
+msgstr "Oppmerksomhetsmelding mottatt"
 
 #: gajim/config.py:2989
 msgid "First Message Received"
-msgstr "Første Melding Motatt"
+msgstr "Første melding motatt"
 
 #: gajim/config.py:2990
 msgid "Next Message Received Focused"
-msgstr "Neste Melding Motatt i Fokus"
+msgstr "Neste melding motatt i fokus"
 
 #: gajim/config.py:2992
 msgid "Next Message Received Unfocused"
-msgstr "Neste Melding Motatt ikke i Fokus"
+msgstr "Neste melding motatt ikke i fokus"
 
 #: gajim/config.py:2993
 msgid "Contact Connected"
-msgstr "Kontakt Koblet til"
+msgstr "Kontakt tilkoblet"
 
 #: gajim/config.py:2994
 msgid "Contact Disconnected"
-msgstr "Kontakt Frakoblet"
+msgstr "Kontakt frakoblet"
 
 #: gajim/config.py:2995
 msgid "Message Sent"
-msgstr "Melding Sendt"
+msgstr "Melding sendt"
 
 #: gajim/config.py:2996
 msgid "Group Chat Message Highlight"
-msgstr "Gruppe Samtale Melding Utheving"
+msgstr "Utheving av Gruppesamtale-melding"
 
 #: gajim/config.py:2997
 msgid "Group Chat Message Received"
-msgstr "Gruppe Samtale Melding Motatt"
+msgstr "Gruppesamtale-melding motatt"
 
 #: 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"
+msgstr "%(owner_or_admin_or_member)s av denne gruppesamtalen"
 
 #: gajim/tooltips.py:263 gajim/common/helpers.py:473
 msgid "?Group Chat Contact Affiliation:None"
@@ -3130,14 +3053,12 @@ msgid "Disconnected"
 msgstr "Frakoblet"
 
 #: gajim/tooltips.py:647
-#, fuzzy
 msgid "?Noun:Download"
-msgstr "Last ned"
+msgstr "?Noun:Nedlasting"
 
 #: gajim/tooltips.py:653
-#, fuzzy
 msgid "?Noun:Upload"
-msgstr "Last opp"
+msgstr "?Noun:Opplasting"
 
 #: gajim/tooltips.py:660
 msgid "Type: "
@@ -3157,7 +3078,7 @@ msgstr "Stoppet"
 
 #: gajim/tooltips.py:673 gajim/tooltips.py:676
 msgid "Completed"
-msgstr "Komplett"
+msgstr "Fullført"
 
 #: gajim/tooltips.py:679
 msgid "?transfer status:Paused"
@@ -3176,13 +3097,12 @@ msgid "Status: "
 msgstr "Status: "
 
 #: gajim/tooltips.py:719 gajim/common/helpers.py:389
-#, fuzzy
 msgid "?user status:Available"
-msgstr "?transfer status:Pauset"
+msgstr "?user status:Tilgjengelig"
 
 #: gajim/tooltips.py:721 gajim/common/helpers.py:384
 msgid "Free for Chat"
-msgstr "Ledig for Prat"
+msgstr "Ledig for prat"
 
 #: gajim/tooltips.py:723 gajim/common/commands.py:117
 #: gajim/common/helpers.py:396
@@ -3204,19 +3124,19 @@ msgstr "Frakoblet"
 
 #: gajim/advanced_configuration_window.py:88
 msgid "Activated"
-msgstr "Aktivert"
+msgstr "PÃ¥skrudd"
 
 #: gajim/advanced_configuration_window.py:88
 msgid "Deactivated"
-msgstr "Deaktivert"
+msgstr "Avskrudd"
 
 #: gajim/advanced_configuration_window.py:90
 msgid "Boolean"
-msgstr "Boolean"
+msgstr "Boolsk"
 
 #: gajim/advanced_configuration_window.py:91
 msgid "Integer"
-msgstr "Nummer"
+msgstr "Heltall"
 
 #: gajim/advanced_configuration_window.py:92
 msgid "Text"
@@ -3229,7 +3149,7 @@ msgstr "Farge"
 
 #: gajim/advanced_configuration_window.py:104
 msgid "Preference Name"
-msgstr "Foretrukket Navn"
+msgstr "Foretrukket navn"
 
 #: gajim/advanced_configuration_window.py:111
 msgid "Value"
@@ -3237,7 +3157,7 @@ msgstr "Verdi"
 
 #: gajim/advanced_configuration_window.py:120
 msgid "Type"
-msgstr "Skrive"
+msgstr "Skriv"
 
 #: gajim/advanced_configuration_window.py:176
 msgid "(None)"
@@ -3249,95 +3169,91 @@ msgstr "Gjemt"
 
 #: gajim/logind_listener.py:58
 msgid "Machine going to sleep"
-msgstr ""
+msgstr "Maskinen går i dvale"
 
 #: gajim/logind_listener.py:90
 msgid "Disconnect from the network"
-msgstr ""
+msgstr "Koble fra nettverket"
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
-msgstr "Samtale Historikk med %s"
+msgstr "Konversasjonshistorikk med %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
-msgstr "Samtale Historikk"
+msgstr "Samtalehistorikk"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
-msgstr "Disk Feil"
+msgstr "Diskfeil"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
-msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
+msgstr "%(nick)s er %(status)s nå: %(status_msg)s"
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Feil: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Feil"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
-msgstr "Status er nå: %(status)s: %(status_msg)s"
+msgstr "Statusen er nå: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
-msgstr "Status er nå: %(status)s"
+msgstr "Statusen er nå: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
-msgstr "Tittel: %s\n"
+msgstr "Tema: %s\n"
 
 #: gajim/statusicon.py:215
-#, fuzzy
 msgid "_Change Status Message…"
-msgstr "_Endre Status Melding"
+msgstr "_Endre statusmelding…"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
-#: gajim/statusicon.py:315
-#, fuzzy
+#: gajim/statusicon.py:319
 msgid "_Manage Bookmarks…"
-msgstr "Behandle Bokmerker"
+msgstr "_Behandle Bokmerker…"
 
-#: gajim/statusicon.py:328
-#, fuzzy
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
-msgstr "i _kontaktliste"
+msgstr "Skjul _kontaktliste"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
-msgstr "Vis _Kontaktliste"
+msgstr "Vis _kontaktliste"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
-msgstr "Gjem dette vinduet"
+msgstr "Skjul denne menyen"
 
 #: gajim/dataforms_widget.py:587
-#, fuzzy
 msgid "Unable to load image"
-msgstr "Klarer ikke å uvirksom modulen"
+msgstr "Bilde kunne ikke lastes inn"
 
 #: gajim/dataforms_widget.py:589
-#, fuzzy, python-format
+#, python-format
 msgid "Media type not supported: %s"
-msgstr "Usynlighet ikke støttet"
+msgstr "Mediatypen støttes ikke: %s"
 
 #: gajim/dataforms_widget.py:604
 msgid "This field is required"
-msgstr ""
+msgstr "Dette feltet er påkrevd"
 
 #: gajim/dataforms_widget.py:658
 msgid "new@jabber.id"
@@ -3351,33 +3267,32 @@ msgstr "ny%d@jabber.id"
 #: gajim/server_info.py:130
 #, python-format
 msgid "%(days)s days, %(hours)s hours"
-msgstr ""
+msgstr "%(days)s dager, %(hours)s timer"
 
 #: gajim/server_info.py:187 gajim/accounts_window.py:536
 #: gajim/accounts_window.py:637
-#, fuzzy
 msgid "Hostname"
-msgstr "_Maskinnavn:"
+msgstr "Vertsnavn"
 
 #: gajim/server_info.py:188
-#, fuzzy
 msgid "Server Software"
-msgstr "Server Funksjonalitet"
+msgstr "Tjenerprogramvare"
 
 #: gajim/server_info.py:189
-#, fuzzy
 msgid "Server Uptime"
-msgstr "Servern svarte: %s"
+msgstr "Tjeneroppetid"
 
 #: gajim/server_info.py:227
 msgid ""
 "\n"
 "Disabled in config"
 msgstr ""
+"\n"
+"Avskrudd i oppsett"
 
 #: gajim/disco.py:69
 msgid "This service has not yet responded with detailed information"
-msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
+msgstr "Denne tjenesten har ikke svart med detaljert informasjon"
 
 #: gajim/disco.py:70
 msgid ""
@@ -3385,7 +3300,7 @@ msgid ""
 "It is most likely legacy or broken"
 msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
-"Den er sannsynligvis utdatert eller ødelagt"
+"Den er mest sannsynlig foreldet eller på en snurr."
 
 #: gajim/disco.py:129
 msgid "Others"
@@ -3397,16 +3312,16 @@ msgstr "Konferanse"
 
 #: gajim/disco.py:537
 msgid "Without a connection, you can not browse available services"
-msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
+msgstr "Uten en tilkobling kan du ikke liste opp tilgjengelige tjenester"
 
 #: gajim/disco.py:626
 #, python-format
 msgid "Service Discovery using account %s"
-msgstr "Se etter Tjenester med %s kontoen"
+msgstr "Se etter tjenester med %s-kontoen"
 
 #: gajim/disco.py:628
 msgid "Service Discovery"
-msgstr "Se etter Tjenester"
+msgstr "Se etter tjenester"
 
 #: gajim/disco.py:732
 msgid "The service could not be found"
@@ -3417,8 +3332,8 @@ msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr ""
-"Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
-"adressen og prøv igjen."
+"Det er ingen tjenestetilbud på adressen du oppgav, eller den svarer ikke. "
+"Sjekk adressen og prøv igjen."
 
 #: gajim/disco.py:739 gajim/disco.py:1091
 msgid "The service is not browsable"
@@ -3426,40 +3341,36 @@ msgstr "Ikke mulig å utforske tjeneste"
 
 #: gajim/disco.py:740
 msgid "This type of service does not contain any items to browse."
-msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
+msgstr "Denne typen tjeneste inneholder ingen elementer å utforske."
 
 #: gajim/disco.py:781 gajim/disco.py:791
 msgid "Invalid Server Name"
-msgstr "Ugyldig Servernavn"
+msgstr "Ugyldig tjenernavn"
 
 #: gajim/disco.py:849
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
-msgstr "Utforsk %(address)s med kontoen %(account)s"
+msgstr "Utforsker %(address)s med kontoen %(account)s"
 
 #: gajim/disco.py:896
-#, fuzzy
 msgid "Browse"
-msgstr "_Utforsk"
+msgstr "Utforsk"
 
 #: gajim/disco.py:1092
 msgid "This service does not contain any items to browse."
-msgstr "Denne tjenesten innholer ingen elementer å utforske."
+msgstr "Denne tjenesten innholder ingen elementer å utforske."
 
 #: gajim/disco.py:1304
-#, fuzzy
 msgid "Execute Command"
-msgstr "_Kjør Kommando"
+msgstr "Kjør kommando"
 
 #: gajim/disco.py:1308 gajim/disco.py:1465
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
-#, fuzzy
 msgid "Join"
-msgstr "_Bli med"
+msgstr "Ta del"
 
 #: gajim/disco.py:1326 gajim/data/gui/search_window.ui:23
 msgid "Search"
@@ -3484,7 +3395,7 @@ msgstr "Beskrivelse"
 
 #: gajim/disco.py:1718
 msgid "Id"
-msgstr "Id"
+msgstr "ID"
 
 #: gajim/disco.py:1748 gajim/data/gui/gc_control_popup_menu.ui:99
 msgid "_Bookmark"
@@ -3492,20 +3403,20 @@ msgstr "_Bokmerke"
 
 #: gajim/disco.py:1782
 msgid "Bookmark already set"
-msgstr "Bokmerke allerede satt"
+msgstr "Allerede bokmerket"
 
 #: gajim/disco.py:1783
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
+msgstr "Gruppesamtalen \"%s\" er allerede bokmerket."
 
 #: gajim/disco.py:1793
 msgid "Bookmark has been added successfully"
-msgstr "Bokmerke har blitt lagt til"
+msgstr "Bokmerke lagt til"
 
 #: gajim/disco.py:1794
 msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
+msgstr "Du kan behandle bokmerkene dine fra Handlinger-menyen i kontaktlisten."
 
 #: gajim/disco.py:1986
 msgid "Subscribed"
@@ -3521,19 +3432,19 @@ msgstr "Ny post"
 
 #: gajim/disco.py:2068
 msgid "_Subscribe"
-msgstr "_Abonnér"
+msgstr "_Abonner"
 
 #: gajim/disco.py:2074
 msgid "_Unsubscribe"
-msgstr "_Fjern Abonnement"
+msgstr "_Fjern abonnement"
 
 #: 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 ""
-"Tekst under denne linjen er hva som har blitt sagt\n"
-"siden sist du fulgte med i denne gruppe samtalen"
+"Teksten under denne linjen er det som har blitt sagt\n"
+"siden sist du fulgte med i denne gruppesamtalen"
 
 #: gajim/conversation_textview.py:561
 msgid "_Quote"
@@ -3546,75 +3457,74 @@ msgstr "_Handlinger for \"%s\""
 
 #: gajim/conversation_textview.py:583
 msgid "Read _Wikipedia Article"
-msgstr "Les_Wikipedia Artikkel"
+msgstr "Les_Wikipedia-artikkel"
 
 #: gajim/conversation_textview.py:588
 msgid "Look it up in _Dictionary"
-msgstr "Slå det opp i _Ordbok"
+msgstr "Slå det opp i _ordboka"
 
 #: 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"
+msgstr "Ordboks-URL-en mangler en \"%s\" og er ikke WIKTIONARY"
 
 #: gajim/conversation_textview.py:619
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
-msgstr "Web Søk URL mangler en \"%s\""
+msgstr "Nettsøks-URL-en mangler en \"%s\""
 
 #: gajim/conversation_textview.py:622
 msgid "Web _Search for it"
-msgstr "Web _Søk etter den"
+msgstr "_Søk på nettet etter den"
 
 #: gajim/conversation_textview.py:628
 msgid "Open as _Link"
-msgstr "Ã…pne som _Link"
+msgstr "Ã…pne som _lenke"
 
 #: gajim/conversation_textview.py:847
 msgid "URL:"
-msgstr ""
+msgstr "Nettadresse:"
 
 #: gajim/conversation_textview.py:1021
-#, fuzzy
 msgid "Invalid URL"
-msgstr "Ugyldig JID"
+msgstr "Ugyldig nettadresse"
 
 #: gajim/conversation_textview.py:1106
 msgid ""
 "<b>Message corrected. Original message:</b>\n"
 "{}"
 msgstr ""
+"<b>Korrigert melding. Opprinnelig melding:</b>\n"
+"{}"
 
 #: gajim/conversation_textview.py:1250
-#, fuzzy, python-format
+#, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
 msgstr[0] "I går"
-msgstr[1] "I går"
+msgstr[1] "%(nb_days)i dager siden"
 
 #: gajim/message_textview.py:43
-#, fuzzy
 msgid "Write a message.."
-msgstr "Ny Privat Melding"
+msgstr "Skriv en melding…"
 
 #: gajim/message_window.py:245
 msgid "You are going to close several tabs"
-msgstr "Du kommer til å lukke flere tabber"
+msgstr "Du er i ferd med å lokke flerfoldige faner"
 
 #: gajim/message_window.py:246
 msgid "Do you really want to close them all?"
-msgstr "Ønsker du virkelig å lukke alle?"
+msgstr "Ønsker du å lukke alle sammen?"
 
-#: gajim/message_window.py:541
-#, fuzzy
+#: gajim/message_window.py:523
 msgid "?Noun:Chats"
-msgstr "Gruppe Samtaler"
+msgstr "?Noun:Sludringer"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
-msgstr "Private Samtaler"
+msgstr "Private samtaler"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Meldinger"
 
@@ -3623,19 +3533,20 @@ msgstr "Meldinger"
 #: 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"
+msgstr "Kunne ikke ta del i gruppesamtale"
 
 #: gajim/gui_interface.py:158
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Your desired nickname in group chat\n"
 "<b>%s</b>\n"
 "is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
-"Ditt ønskede kallenavn i gruppesamtale %s er i bruk eller er registrert av "
-"en annen samtalebruker.\n"
-"Vennligst skriv et annet kallenavn under:"
+"Ditt ønskede kallenavn i gruppesamtale\n"
+"<b>%s</b>\n"
+"er i bruk eller registrert av en annen samtalebruker.\n"
+"Skriv inn et annet kallenavn nedenfor:"
 
 #: gajim/gui_interface.py:162
 msgid "Always use this nickname when there is a conflict"
@@ -3648,61 +3559,59 @@ msgstr "Godtar du denne forespørselen?"
 #: 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?"
+msgstr "Godtar du denne forespørselen på %s-kontoen?"
 
 #: gajim/gui_interface.py:185
-#, fuzzy, python-format
+#, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
-msgstr "HTTP (%(method)s) Autentisering for %(url)s (id: %(id)s)"
+msgstr "HTTP (%(method)s)-gjodkjenning for %(url)s (ID: %(id)s)"
 
 #: gajim/gui_interface.py:229 gajim/notify.py:96
 msgid "Connection Failed"
-msgstr "Tilkobling Feilet"
+msgstr "Tilkobling mislyktes"
 
 #: 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."
+msgstr "Et passord kreves for å ta del i rommet %s. Skriv det inn."
 
 #: gajim/gui_interface.py:330
-#, fuzzy, python-format
+#, python-format
 msgid "<b>%s</b> is full"
-msgstr "<b>Font</b>"
+msgstr "<b>%s</b> er full"
 
 #: gajim/gui_interface.py:339
-#, fuzzy, python-format
+#, python-format
 msgid "You are banned from group chat <b>%s</b>."
-msgstr "Du er uønsket fra gruppesamtalen %s."
+msgstr "Du er bannlyst fra gruppesamtalen <b>%s</b>."
 
 #: gajim/gui_interface.py:346
-#, fuzzy, python-format
+#, python-format
 msgid "Remote server <b>%s</b> does not exist."
-msgstr "Gruppesamtalerom %s finnes ikke."
+msgstr "Fjerntjeneren <b>%s</b> finnes ikke."
 
 #: gajim/gui_interface.py:350
-#, fuzzy, python-format
+#, python-format
 msgid "Group chat <b>%s</b> does not exist."
-msgstr "Gruppesamtalerom %s finnes ikke."
+msgstr "Gruppesamtalen <b>%s</b> finnes ikke."
 
 #: gajim/gui_interface.py:353
-#, fuzzy
 msgid "Group chat creation is not permitted."
-msgstr "Gruppesamtale oppretting er begrenset."
+msgstr "Oppretting av gruppesludring tillates ikke."
 
 #: gajim/gui_interface.py:355
-#, fuzzy
 msgid "Unable to join groupchat"
-msgstr "Klarer ikke å gå inn i gruppesamtale"
+msgstr "Kunne ikke ta del i gruppesludring"
 
 #: gajim/gui_interface.py:356
-#, fuzzy, python-format
+#, python-format
 msgid "You must use your registered nickname in <b>%s</b>."
-msgstr "Ditt registrerte kallenavn må brukes i gruppesamtale %s. "
+msgstr "Ditt registrerte kallenavn må brukes i <b>%s</b>."
 
 #: 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."
+msgstr "Du er ikke på medlemslista for gruppesamtalen %s."
 
 #: gajim/gui_interface.py:455 gajim/gui_interface.py:459
 #, python-format
@@ -3710,51 +3619,50 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Feil %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
-msgstr "feil ved sending %(message)s ( %(error)s )"
+msgstr "feil ved forsendelse av %(message)s ( %(error)s )"
 
 #: gajim/gui_interface.py:513 gajim/notify.py:96
 msgid "Subscription request"
-msgstr "Abonnerings forespørsel"
+msgstr "Abonnementsforespørsel"
 
 #: gajim/gui_interface.py:524 gajim/common/contacts.py:131
 #: gajim/common/helpers.py:95
 msgid "Observers"
-msgstr "Observerere"
+msgstr "Observatører"
 
 #: gajim/gui_interface.py:538
 msgid "Authorization accepted"
-msgstr "Godkjenningsforespørel akseptert"
+msgstr "Godkjenning godtatt"
 
 #: 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."
+msgstr "Kontakten \"%s\" har godkjent at du kan se vedkommendes status."
 
 #: gajim/gui_interface.py:547
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
+msgstr "Kontakten \"%s\" abonnerer ikke lengre på deg"
 
 #: gajim/gui_interface.py:548
-#, fuzzy
 msgid ""
 "You will always see them as offline.\n"
 "Do you want to remove them from your contact list?"
 msgstr ""
-"Du vil alltid se han eller henne som frakoblet.\n"
-"Ønsker du å fjerne han eller henne fra din kontakt liste?"
+"Du vil alltid se dem som frakoblet.\n"
+"Ønsker du å fjerne dem fra kontaktlisten din?"
 
 #: gajim/gui_interface.py:570 gajim/notify.py:96
 msgid "Unsubscribed"
-msgstr "Fjern Abonnement"
+msgstr "Abonnement opphevet"
 
 #: gajim/gui_interface.py:582
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt med \"%s\" kan ikke opprettes"
+msgstr "Det oppnås ikke kontakt med \"%s\""
 
 #: gajim/gui_interface.py:583 gajim/common/connection.py:1282
 #: gajim/common/connection.py:1468
@@ -3764,170 +3672,162 @@ msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 #: gajim/gui_interface.py:641
 #, python-format
 msgid "%(jid)s declined the invitation: %(reason)s"
-msgstr ""
+msgstr "%(jid)s avslo invitasjonen: %(reason)s"
 
 #: gajim/gui_interface.py:645
 #, python-format
 msgid "%(jid)s declined the invitation"
-msgstr ""
+msgstr "%(jid)s avslo invitasjonen"
 
 #: gajim/gui_interface.py:675
-#, fuzzy
 msgid ""
 "You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
 "running or it returned a wrong passphrase.\n"
 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"
+"Du har satt opp Gajim til å bruke en OpenPGP-agent, men det er ingen OpenPGP-"
+"agent som kjører, eller så svarte den med feil passord.\n"
 
 #: 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."
+msgstr "Du er i øyeblikket tilkoblet uten din OpenPGP-nøkkel."
 
 #: gajim/gui_interface.py:680
-#, fuzzy
 msgid "Wrong passphrase"
-msgstr "Feil Passordsetning"
+msgstr "Feil passord"
 
 #: gajim/gui_interface.py:685
-#, fuzzy
 msgid "Wrong OpenPGP passphrase"
-msgstr "Feil Passordsetning"
+msgstr "Feil OpenPGP-passord"
 
 #: gajim/gui_interface.py:699
-#, fuzzy
 msgid "Certificate Passphrase Required"
-msgstr "Sertifikatet har utløpt"
+msgstr "Sertifikat-passord kreves"
 
 #: gajim/gui_interface.py:700
-#, fuzzy, python-format
+#, python-format
 msgid "Enter the certificate passphrase for account %s"
-msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
+msgstr "Skriv in sertifikatspassordet for kontoen %s"
 
 #: gajim/gui_interface.py:723
-#, fuzzy
 msgid "Untrusted OpenPGP key"
-msgstr "Velg din OpenPGP nøkkel"
+msgstr "Ubetrodd OpenPGP-nøkkel"
 
 #: 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 nøkkelen brukt til å kryptere denne samtalen er ikke tiltrodd. Ønsker du "
-"virkelig å kryptere denne meldingen?"
+"OpenPGP-nøkkelen brukt til å kryptere denne samtalen er ikke betrodd. Ønsker "
+"du virkelig å kryptere denne meldingen?"
 
 #: gajim/gui_interface.py:769
 msgid ""
 "Please copy / paste the refresh token from the website that has just been "
 "opened."
 msgstr ""
+"Kopier / lim inn gjenoppfriskningssymbolet fra nettsiden som akkurat har "
+"blitt åpnet."
 
 #: gajim/gui_interface.py:772
 msgid "Oauth2 Credentials"
-msgstr ""
+msgstr "OAuth2-akkreditiver"
 
 #: gajim/gui_interface.py:924
 #, python-format
 msgid "%s wants to send you a file."
-msgstr "%s ønsker å sende deg en fil."
+msgstr "%s ønsker å sende deg ei fil."
 
 #: gajim/gui_interface.py:1021 gajim/gui_interface.py:1430
 msgid "SSL certificate error"
-msgstr "SSL sertifikats feil"
+msgstr "Feil med SSL-sertifikat"
 
 #: gajim/gui_interface.py:1038
-#, fuzzy
 msgid "File Transfer Failed"
-msgstr "Fil Overføringer"
+msgstr "Filoverføring mislyktes"
 
 #: gajim/gui_interface.py:1060
-#, fuzzy, python-format
+#, python-format
 msgid "%(filename)s received from %(name)s."
-msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
+msgstr "%(filename)s mottatt fra %(name)s."
 
 #: 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."
+msgstr "Filoverføringen %(filename)s fra %(name)s stoppet."
 
 #: gajim/gui_interface.py:1068
-#, fuzzy, python-format
+#, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
-msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
+msgstr "Filoverføringen %(filename)s fra %(name)s mislyktes."
 
 #: 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."
+msgstr "Du har sendt %(filename)s til %(name)s."
 
 #: 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."
+msgstr "Filoverføringen %(filename)s til %(name)s har stoppet."
 
 #: gajim/gui_interface.py:1089
-#, fuzzy, python-format
+#, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
-msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
+msgstr "Filoverføringen %(filename)s til %(name)s mislyktes."
 
 #: gajim/gui_interface.py:1153
-#, fuzzy
 msgid "Choose file to send"
-msgstr "Velg Fil for Sending..."
+msgstr "Velg fil å sende"
 
 #: gajim/gui_interface.py:1196
 msgid "Unable to decrypt message"
-msgstr "Klarer ikke å dekryptere meldingen"
+msgstr "Kunne ikke dekryptere meldingen"
 
 #: gajim/gui_interface.py:1208
 msgid "Username Conflict"
-msgstr "Brukernavn Konflikt"
+msgstr "Brukernavn-konflikt"
 
 #: 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"
+msgstr "Skriv inn nytt brukernavn for din lokale konto"
 
 #: gajim/gui_interface.py:1232
 msgid "Resource Conflict"
-msgstr "Ressurs Konflikt"
+msgstr "Ressurskonflikt"
 
 #: gajim/gui_interface.py:1233
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
-"Du er allerede tilkoblet til denne kontoen med det samme ressursnavnet. Prøv "
-"et annet"
+"Du er allerede tilkoblet denne kontoen med samme ressurs. Skriv in en ny en"
 
 #: gajim/gui_interface.py:1290
-#, fuzzy, python-format
+#, python-format
 msgid "%s wants to start a voice chat."
-msgstr "%s ønsker å sende deg en fil."
+msgstr "%s ønsker å starte en lydsamtale."
 
 #: gajim/gui_interface.py:1293
-#, fuzzy
 msgid "Voice Chat Request"
-msgstr "Fil Overførings Forespørsel"
+msgstr "Forespørsel om lydsamtale"
 
 #: gajim/gui_interface.py:1383
 msgid "Error verifying SSL certificate"
-msgstr "Feil ved verifisering av SSL sertifikat"
+msgstr "Feil ved bekreftelse av SSL-sertifikat"
 
 #: gajim/gui_interface.py:1384
-#, fuzzy, python-format
+#, 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 ""
-"Det skjedde en feil i verifisering av SSL sertifikatet for din jabber "
-"server: %(error)s\n"
-"Ønsker du fortsatt å koble til denne serveren?"
+"Det skjedde en feil ved bekrefting av SSL-sertifikatet for din XMPP-tjener: "
+"%(error)s\n"
+"Ønsker du fortsatt å koble til denne tjeneren?"
 
 #: gajim/gui_interface.py:1388
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA-1 fingerprint of the certificate:\n"
@@ -3937,18 +3837,20 @@ msgid ""
 msgstr ""
 "Legg til dette sertifikatet i listen over tiltrodde sertifikater.\n"
 "SHA1 fingeravtrykk til sertifikatet:\n"
-"%s"
+"%(sha1)s\n"
+"SHA-256 -fingeravtrykk av sertifikatet:\n"
+"%(sha256)s"
 
 #: gajim/gui_interface.py:1394
 msgid "Ignore this error for this certificate."
-msgstr "Ignorer denne feilen for dette sertifikatet"
+msgstr "Se bort fra denne feilen for dette sertifikatet."
 
 #: gajim/gui_interface.py:1407
 msgid "Non Anonymous Server"
-msgstr ""
+msgstr "Ikke-anonym tjener"
 
 #: gajim/gui_interface.py:1431
-#, fuzzy, python-format
+#, 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"
@@ -3961,56 +3863,56 @@ msgid ""
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
-"Det ser ut som SSL sertifikatet for konto %(account)s har endret seg eller "
-"din tilkobling blir hacket.\n"
-"Gammelt fingeravtrykk: %(old)s\n"
-"Nytt fingeravtrykk: %(new)s\n"
+"Det ser ut som SSL-sertifikatet for konto %(account)s har endret seg, eller "
+"din tilkobling blir utnyttet.\n"
+"\n"
+"Gammelt SHA-1 -fingeravtrykk: %(old_sha1)s\n"
+"Gammelt SHA-256 -fingeravtrykk: %(old_sha256)s\n"
 "\n"
-"Ønsker du fortsatt å koble til og oppdatere fingeravtrykket til sertifikatet?"
+"Nytt SHA-1 -fingeravtrykk: %(new_sha1)s\n"
+"Nytt SHA-256 -fingeravtrykk: %(new_sha256)s\n"
+"\n"
+"Ønsker du fortsatt å koble til og oppdatere sertifikatets fingeravtrykk?"
 
 #: 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 ""
-"Du er i ferd med å sende passordet ditt over en usikkert tilkobling. Du "
-"burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
-"ønsker å fortsette?"
+"Fant ikke PyOpenSSL. Ã… sende passordet ditt over en usikret tilkobling "
+"frarådes sterkt. Er du sikker på at du ønsker å gjøre dette?"
 
 #: 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 ""
-"Du skal til å sende passordet ditt over en usikker kobling. Er du sikker på "
-"at du ønsker å gjøre det?"
+"Du er i ferd med å sende passordet ditt ukryptert over en usikret "
+"forbindelse. Er du sikker på at du vil gjøre det?"
 
 #: gajim/gui_interface.py:1848
-#, fuzzy
 msgid "JID is not a Groupchat"
-msgstr "Dette er ikke en samtalegruppe"
+msgstr "JID-en er ikke en gruppesludring"
 
 #: gajim/gui_interface.py:2005 gajim/gui_interface.py:2013
 msgid "Emoticons disabled"
-msgstr "Uttryksikoner avslått"
+msgstr "Humørfjes avskrudd"
 
 #: gajim/gui_interface.py:2006
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
-"Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
-"blitt slått av. "
+"Din oppsatte humørfjes-drakt ble ikke funnet, så humørfjes har blitt "
+"avskrudd."
 
 #: gajim/gui_interface.py:2014
-#, fuzzy
 msgid ""
 "Your configured emoticons theme could not be loaded. See the log for more "
 "details."
 msgstr ""
-"Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
-"blitt slått av. "
+"Din oppsatte smilefjesdrakt kunne ikke innlastes. Sjekk loggen for flere "
+"detaljer."
 
 #: gajim/gui_interface.py:2032
 msgid "This is not a group chat"
@@ -4023,45 +3925,47 @@ msgid ""
 "correct group chat name. If it is, delete it from your roster and try "
 "joining the group chat again."
 msgstr ""
+"%(room_jid)s er allerede i kontaktlisten din. Sjekk at %(room_jid)s er et "
+"korrekt gruppesludringsnavn. Hvis det er det, slett det fra listen og prøv å "
+"ta del i gruppesludringen igjen."
 
 #: gajim/gui_interface.py:2411
 msgid "Could not save your settings and preferences"
-msgstr "Kan ikke lagre dine innstillinger og valg"
+msgstr "Kunne ikke lagre innstillinger"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
-msgstr "standard"
+msgstr "forvalg"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
-msgstr "Passordsetning Kreves"
+msgstr "Passord kreves"
 
-#: gajim/gui_interface.py:2982
-#, fuzzy, python-format
+#: gajim/gui_interface.py:2983
+#, 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)."
+msgstr ""
+"Skriv inn passordet for OpenPGP-nøkkelen %(keyid)s (konto %(account)s)."
 
-#: gajim/gui_interface.py:2996
-#, fuzzy
+#: gajim/gui_interface.py:2997
 msgid "OpenPGP key expired"
-msgstr "GPG nøkkel utgått"
+msgstr "OpenPGP-nøkkel utløpt"
 
-#: gajim/gui_interface.py:2997
-#, fuzzy, python-format
+#: gajim/gui_interface.py:2998
+#, 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."
+msgstr "Din OpenPGP-nøkkel har utløpt, du vil kobles til %s uten OpenPGP."
 
-#: gajim/gui_interface.py:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
-msgstr "Feil Passordsetning"
+msgstr "Feil passordsetning"
 
-#: gajim/gui_interface.py:3007
-#, fuzzy
+#: gajim/gui_interface.py:3008
 msgid "Please retype your OpenPGP passphrase or press Cancel."
-msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
+msgstr "Skriv inn din OpenPGP-passordsetning på ny eller trykk Avbryt."
 
 #: gajim/search_window.py:108
 msgid "Waiting for results"
@@ -4069,31 +3973,30 @@ msgstr "Venter på resultater"
 
 #: gajim/search_window.py:146 gajim/search_window.py:224
 msgid "Error in received dataform"
-msgstr "Feil i motatt dataskjema"
+msgstr "Feil i mottatt dataskjema"
 
 #: gajim/search_window.py:181 gajim/search_window.py:216
 msgid "No result"
-msgstr "Ingen resultater"
+msgstr "Inget resultat"
 
 #: gajim/htmltextview.py:559
-#, fuzzy
 msgid "Loading"
-msgstr "Koder"
+msgstr "Laster"
 
 #: gajim/atom_window.py:123
-#, fuzzy, python-format
+#, python-format
 msgid "You have received new entries (and %d not displayed):"
 msgid_plural "You have received new entries (and %d not displayed):"
-msgstr[0] "Du har motatt nye hendelser (og %(count)d vises ikke):"
-msgstr[1] "Du har motatt nye hendelser (og %(count)d vises ikke):"
+msgstr[0] "Du har motatt nye oppføringer (og %d som ikke er vist):"
+msgstr[1] "Du har motatt nye oppføringer (og %d som ikke er vist):"
 
 #: gajim/atom_window.py:128 gajim/data/gui/atom_entry_window.ui:20
 msgid "You have received new entry:"
-msgstr "Du har mottatt en ny inntreden:"
+msgstr "Du har mottatt en ny oppføring:"
 
 #: gajim/adhoc_commands.py:111 gajim/data/gui/adhoc_commands_window.ui:9
 msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc kommandoer - Gajim"
+msgstr "Ad hoc-kommandoer - Gajim"
 
 #: gajim/adhoc_commands.py:320
 msgid "Cancel confirmation"
@@ -4102,7 +4005,7 @@ msgstr "Avbryt bekreftelse"
 #: gajim/adhoc_commands.py:321
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
-msgstr "Du er i ferd med å eksekvere en kommando. Ønsker du å avbryte den?"
+msgstr "Du er i ferd med å kjøre en kommando. Ønsker du å avbryte den?"
 
 #: gajim/adhoc_commands.py:387 gajim/adhoc_commands.py:411
 msgid "Service sent malformed data"
@@ -4110,34 +4013,32 @@ msgstr "Tjenesten sendte ødelagte data"
 
 #: gajim/adhoc_commands.py:396
 msgid "Service changed the session identifier."
-msgstr "Tjenesten endret sesjons identifikasjon. "
+msgstr "Tjenesten endret øktas identifikator."
 
 #: gajim/adhoc_commands.py:416
-#, fuzzy, python-format
+#, python-format
 msgid "%s - Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc kommandoer - Gajim"
+msgstr "%s - Ad hoc-kommandoer - Gajim"
 
 #: gajim/adhoc_commands.py:510
 msgid "Service returned an error."
-msgstr "Tjenesten returnerte en feil."
+msgstr "Tjenesten meldte fra om feil."
 
 #: gajim/negotiation.py:34
 msgid "- messages will be logged"
-msgstr "- meldinger vil bli logget"
+msgstr "- meldinger vil loggføres"
 
 #: gajim/negotiation.py:36
 msgid "- messages will not be logged"
-msgstr "- -meldinger vil ikke bli logget"
+msgstr "- meldinger vil ikke loggføres"
 
 #: gajim/notify.py:103
-#, fuzzy
 msgid "Open"
-msgstr "OpenPGP"
+msgstr "Ã…pne"
 
 #: gajim/dialog_messages.py:33
-#, fuzzy
 msgid "You can not start a new conversation unless you are connected."
-msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
+msgstr "Du kan ikke starte en ny samtale uten å være tilkoblet."
 
 #: gajim/dialog_messages.py:48
 msgid "Unread events"
@@ -4149,21 +4050,19 @@ msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
 #: gajim/dialog_messages.py:53
 msgid "You are currently connected to the server"
-msgstr "Du er for øyeblikket tilkoblet til serveren"
+msgstr "Du er for øyeblikket tilkoblet tjeneren"
 
 #: gajim/dialog_messages.py:54
 msgid "To disable the account, you must be disconnected."
-msgstr "For å deaktivere kontoen, må du være tilkoblet."
+msgstr "For å skru av kontoen, må du være frakoblet."
 
 #: gajim/dialog_messages.py:58
-#, fuzzy
 msgid "Invalid Form"
-msgstr "Ugyldig rom"
+msgstr "Ugyldig skjema"
 
 #: gajim/dialog_messages.py:59
-#, fuzzy
 msgid "The form is not filled correctly."
-msgstr "Kallenavnet inneholder ulovlige tegn"
+msgstr "Skjemaet ble ikke fylt ut rett."
 
 #: gajim/dialog_messages.py:63 gajim/common/helpers.py:406
 msgid "Invisible"
@@ -4178,14 +4077,12 @@ msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
 #: gajim/dialog_messages.py:73
-#, fuzzy
 msgid "JID already in list"
-msgstr "Jabber ID allerede i listen"
+msgstr "JID-en er allerede i listen"
 
 #: gajim/dialog_messages.py:74
-#, fuzzy
 msgid "The JID you entered is already in the list. Choose another one."
-msgstr "Jabber IDen du skrev inn er allerede i lsiten. Vennligst velg en ny. "
+msgstr "JID-en du skrev inn er allerede i listen. Velg en annen."
 
 #: gajim/dialog_messages.py:78
 msgid "Invalid answer"
@@ -4195,21 +4092,20 @@ msgstr "Ugyldig svar"
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
-"Transporten %(name)s svarte feil på registrerings forespørselen: %(error)s"
+"Transporten %(name)s svarte feil på registreringsforespørselen: %(error)s"
 
 #: gajim/dialog_messages.py:84
-#, fuzzy
 msgid "Wrong Custom Hostname"
-msgstr "Bruk egendefinert maskinnavn/port"
+msgstr "Feil egendefinert vertsnavn"
 
 #: gajim/dialog_messages.py:85
-#, fuzzy, python-format
+#, python-format
 msgid "Wrong custom hostname \"%s\". Ignoring it."
-msgstr "Bruk egendefinert maskinnavn/port"
+msgstr "Feil egendefinert vertsnavn \"%s\". Ignorerer."
 
 #: gajim/dialog_messages.py:89
 msgid "Error while removing privacy list"
-msgstr "Feil ved fjerning av liste over uønskede"
+msgstr "Feil ved fjerning av personvernsliste"
 
 #: gajim/dialog_messages.py:90
 #, python-format
@@ -4217,17 +4113,17 @@ msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
-"Privatlivs listen %s har ikke blitt fjernet. Den er kanskje aktiv i en av "
-"dine tilkoblede ressurser. Deaktiver den og prøv igjen."
+"Personvernslisten %s har ikke blitt fjernet. Den er kanskje i bruk i en av "
+"dine tilkoblede ressurser. Skru den av og prøv igjen."
 
 #: gajim/dialog_messages.py:96
 msgid "Invisibility not supported"
-msgstr "Usynlighet ikke støttet"
+msgstr "Usynlighet støttes ikke"
 
 #: gajim/dialog_messages.py:97
 #, python-format
 msgid "Account %s doesn't support invisibility."
-msgstr "Konto %s støtter ikke usynlighet."
+msgstr "%s-kontoen støtter ikke usynlighet."
 
 #: gajim/dialog_messages.py:101
 msgid "Unregister failed"
@@ -4236,16 +4132,16 @@ msgstr "Avregistrering feilet"
 #: gajim/dialog_messages.py:102
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
-msgstr "Avregistrering med server %(server)s feilet: %(error)s"
+msgstr "Avregistrering med tjeneren %(server)s feilet: %(error)s"
 
 #: gajim/dialog_messages.py:106
 msgid "Registration succeeded"
-msgstr "Registrering vellykket"
+msgstr "Registrert"
 
 #: gajim/dialog_messages.py:107
 #, python-format
 msgid "Registration with agent %s succeeded"
-msgstr "Registrering med agenten %s var vellykket"
+msgstr "Vellykket registrering med agenten %s"
 
 #: gajim/dialog_messages.py:111
 msgid "Registration failed"
@@ -4256,24 +4152,25 @@ msgstr "Registrering feilet"
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
-"Registrering med agenten %(agent)s feilet med melding %(error)s: "
+"Registrering med agenten %(agent)s feilet med meldingen %(error)s: "
 "%(error_msg)s"
 
 #: gajim/dialog_messages.py:117
-#, fuzzy
 msgid "Unable to join Groupchat"
-msgstr "Klarer ikke å gå inn i gruppesamtale"
+msgstr "Klarte ikke å ta del i gruppesludring"
 
 #: gajim/dialog_messages.py:122
 msgid "GStreamer error"
-msgstr ""
+msgstr "GStreamer-feil"
 
 #: gajim/dialog_messages.py:123
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Error: %(error)s\n"
 "Debug: %(debug)s"
-msgstr "Feil melding: %s"
+msgstr ""
+"Feil: %(error)s\n"
+"Feilretting: %(debug)s"
 
 #: gajim/dialog_messages.py:127
 msgid "Wrong host"
@@ -4285,7 +4182,7 @@ msgstr "Ugyldig lokal adresse? :-O"
 
 #: gajim/dialog_messages.py:132
 msgid "Avahi error"
-msgstr "Avahi feil"
+msgstr "Avahi-feil"
 
 #: gajim/dialog_messages.py:133
 #, python-format
@@ -4294,93 +4191,85 @@ msgid ""
 "Link-local messaging might not work properly."
 msgstr ""
 "%s\n"
-"Link-lokal meldinger fungerer muligens ikke riktig."
+"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"
+msgstr "Kunne ikke forespørre opplastingsplass"
 
 #: gajim/dialog_messages.py:143
 msgid "Got unexpected response from server (see log)"
-msgstr ""
+msgstr "Uventet svar fra tjener mottatt (sjekk loggføring)"
 
 #: gajim/dialog_messages.py:147 gajim/dialog_messages.py:152
-#, fuzzy
 msgid "Could not open file"
-msgstr "Kunne ikke laste bilde"
+msgstr "Kunne ikke åpne fil"
 
 #: gajim/dialog_messages.py:148
 msgid "Exception raised while opening file (see log)"
-msgstr ""
+msgstr "Unntak oppsto under åpning av fil (sjekk loggføring)"
 
 #: gajim/dialog_messages.py:157
 msgid "Unsecure"
-msgstr ""
+msgstr "Usikker"
 
 #: gajim/dialog_messages.py:158
-#, fuzzy
 msgid "Server returned unsecure transport (http)"
-msgstr "Tjenesten returnerte en feil."
+msgstr "Tjenesten returnerte en usikker transport (HTTP)"
 
 #: gajim/dialog_messages.py:162
-#, fuzzy
 msgid "Could not upload file"
-msgstr "Kunne ikke laste bilde"
+msgstr "Kunne ikke laste opp fil"
 
 #: gajim/dialog_messages.py:163
 #, python-format
 msgid "HTTP response code from server: %s"
-msgstr ""
+msgstr "HTTP-svarkode fra tjener: %s"
 
 #: gajim/dialog_messages.py:167
 msgid "Upload Error"
-msgstr ""
+msgstr "Opplastingsfeil"
 
 #: gajim/dialog_messages.py:172
-#, fuzzy
 msgid "Encryption Error"
-msgstr "Kryptering påslått"
+msgstr "Krypteringsfeil"
 
 #: gajim/dialog_messages.py:173
-#, fuzzy
 msgid "For the choosen encryption is no encryption method available"
-msgstr "Tilkobling ikke tilgjengelig"
+msgstr ""
+"For valgt kryptering finnes det ikke noen tilgjengelig krypteringsmetode"
 
 #: gajim/gajim_themes_window.py:61
 msgid "Theme"
-msgstr "Tema"
+msgstr "Drakt"
 
 #: gajim/gajim_themes_window.py:98
 msgid "You cannot make changes to the default theme"
-msgstr "Du kan ikke gjøre endringer til standard temaet"
+msgstr "Du kan ikke gjøre endringer i forvalgt drakt"
 
 #: gajim/gajim_themes_window.py:99
-#, fuzzy
 msgid "Please create a new clean theme."
-msgstr "Vennligst lag et nytt rent tema med ditt ønskede navn."
+msgstr "Velg en ny og ren drakt."
 
 #: gajim/gajim_themes_window.py:170
 msgid "theme name"
-msgstr "tema navn"
+msgstr "draktnavn"
 
 #: gajim/gajim_themes_window.py:187
 msgid "You cannot delete your current theme"
-msgstr "Du kan ikke slette ditt gjeldene tema"
+msgstr "Du kan ikke slette gjeldende drakt"
 
 #: gajim/gajim_themes_window.py:188
 msgid "Pick another theme to use first."
-msgstr ""
+msgstr "Velg en annen drakt å bruke først."
 
 #: gajim/accounts_window.py:40
-#, fuzzy
 msgid "Merge Accounts"
-msgstr "Samlede kontoer"
+msgstr "Flett kontoer"
 
 #: gajim/accounts_window.py:41
-#, fuzzy
 msgid "Use PGP Agent"
-msgstr "Bruk G_PG Agent"
+msgstr "Bruk PGP-agent"
 
 #: gajim/accounts_window.py:153 gajim/common/config.py:510
 msgid "Be right back."
@@ -4393,74 +4282,65 @@ msgstr "Logge inn på nytt nå?"
 #: gajim/accounts_window.py:158
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
-"Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
+"Dersom du ønsker at endringene skal trå i kraft umiddelbart, må du logge inn "
 "på nytt."
 
 #: gajim/accounts_window.py:211
 #, python-format
 msgid "You have opened chat in account %s"
-msgstr "Du har åpne samtaler på konto %s"
+msgstr "Du har åpne samtaler på %s-kontoen"
 
 #: gajim/accounts_window.py:212
 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"
+msgstr "Fjern"
 
 #: gajim/accounts_window.py:387
-#, fuzzy
 msgid "Rename account label"
-msgstr "Omdøpe Konto"
+msgstr "Gi kontoetikett nytt navn"
 
 #: gajim/accounts_window.py:456
 msgid "Login"
-msgstr ""
+msgstr "Innlogging"
 
 #: gajim/accounts_window.py:465
 msgid "Connection"
 msgstr "Tilkobling"
 
 #: gajim/accounts_window.py:468
-#, fuzzy
 msgid "Import Contacts"
-msgstr "Inviter _Kontakter"
+msgstr "Importer kontakter"
 
 #: gajim/accounts_window.py:471 gajim/accounts_window.py:654
-#, fuzzy
 msgid "Client Certificate"
-msgstr "Selvsignert sertifikat"
+msgstr "Klientsertifikat"
 
 #: gajim/accounts_window.py:474 gajim/accounts_window.py:569
-#, fuzzy
 msgid "OpenPGP Key"
-msgstr "Tilegn OpenPGP Nøkkel"
+msgstr "OpenPGP-nøkkel"
 
 #: gajim/accounts_window.py:485 gajim/accounts_window.py:557
-#, fuzzy
 msgid "Connect on startup"
-msgstr "K_oble til når Gajim starter"
+msgstr "Koble til ved oppstart"
 
 #: gajim/accounts_window.py:488
-#, fuzzy
 msgid "Reconnect when connection is lost"
-msgstr "Koble til automatisk når kontakten mistes"
+msgstr "Koble til igjen automatisk når forbindelsen mistes"
 
 #: gajim/accounts_window.py:491 gajim/accounts_window.py:561
-#, fuzzy
 msgid "Save conversations for all contacts"
-msgstr "Lagre samtale _logger for alle kontakter"
+msgstr "Lagre alle samtaler ført med kontakter"
 
 #: gajim/accounts_window.py:493 gajim/accounts_window.py:563
 msgid "Store conversations on the harddrive"
-msgstr ""
+msgstr "Lagre samtaler på harddisken"
 
 #: gajim/accounts_window.py:495
-#, fuzzy
 msgid "Server Message Archive"
-msgstr "_Send Server Melding..."
+msgstr "Tjenermeldingsarkiv"
 
 #: gajim/accounts_window.py:497
 msgid ""
@@ -4469,16 +4349,18 @@ msgid ""
 "between multiple devices.\n"
 "XEP-0313"
 msgstr ""
+"Meldinger lagres på tjeneren.\n"
+"Arkivet brukes til å synkronisere meldinger\n"
+"mellom flere enheter.\n"
+"XEP-0313"
 
 #: gajim/accounts_window.py:502 gajim/accounts_window.py:565
-#, fuzzy
 msgid "Global Status"
-msgstr "Alle statuser"
+msgstr "Global status"
 
 #: gajim/accounts_window.py:504
-#, fuzzy
 msgid "Synchronise the status of all accounts"
-msgstr "Endrer status på konto eller kontoer"
+msgstr "Synkroniser statusen for alle kontoer"
 
 #: gajim/accounts_window.py:506
 #, fuzzy
@@ -4491,25 +4373,25 @@ msgid ""
 "of sent and received messages.\n"
 "XEP-0280"
 msgstr ""
+"Alle dine andre tilkoblede enheter\n"
+"får kopier av sendte og mottatte meldinger.\n"
+"XEP-0280"
 
 #: gajim/accounts_window.py:512
 msgid "Use file transfer proxies"
-msgstr "Bruk filoverførings proxier"
+msgstr "Bruk filoverførings-mellomtjenere"
 
 #: gajim/accounts_window.py:524 gajim/accounts_window.py:559
-#, fuzzy
 msgid "Use environment variable"
-msgstr "_bruk HTTP_PROXY system variabel"
+msgstr "Bruk miljøvariabel"
 
 #: gajim/accounts_window.py:526
-#, fuzzy
 msgid "Proxy"
-msgstr "Proxy:"
+msgstr "Mellomtjener"
 
 #: gajim/accounts_window.py:529
-#, fuzzy
 msgid "Warn on insecure connection"
-msgstr "_Advar før benyttelse av en usikker tilkobling"
+msgstr "Advar ved usikker tilknytning"
 
 #: gajim/accounts_window.py:533
 msgid "Send keep-alive packets"
@@ -4517,99 +4399,85 @@ msgstr "Send hold-i-live meldinger"
 
 #: gajim/accounts_window.py:537
 msgid "Manually set the hostname for the server"
-msgstr ""
+msgstr "Sett vertsnavnet for tjeneren manuelt"
 
 #: gajim/accounts_window.py:540
-#, fuzzy
 msgid "Resource"
-msgstr "Ressurs:"
+msgstr "Ressurs"
 
 #: gajim/accounts_window.py:543 gajim/accounts_window.py:611
 #: gajim/accounts_window.py:616
-#, fuzzy
 msgid "Priority"
-msgstr "Priorit_et:"
+msgstr "Prioritet"
 
 #: gajim/accounts_window.py:567
-#, fuzzy
 msgid "Synchronize the status of all accounts"
-msgstr "Endrer status på konto eller kontoer"
+msgstr "Synkroniser statusen for alle kontoer"
 
 #: gajim/accounts_window.py:580
-#, fuzzy
 msgid "First Name"
-msgstr "Fornavn:"
+msgstr "Fornavn"
 
 #: gajim/accounts_window.py:583
-#, fuzzy
 msgid "Last Name"
-msgstr "Etternavn:"
+msgstr "Etternavn"
 
 #: gajim/accounts_window.py:586
 #: gajim/data/gui/archiving_313_preferences_window.ui:71
 msgid "Jabber ID"
-msgstr "Jabber ID"
+msgstr "XMPP-ID"
 
 #: gajim/accounts_window.py:589
-#, fuzzy
 msgid "Email"
-msgstr "Ny E-post"
+msgstr "E-post"
 
 #: gajim/accounts_window.py:607
-#, fuzzy
 msgid "Adjust to status"
-msgstr "_Justér etter status"
+msgstr "Juster til status"
 
 #: gajim/accounts_window.py:634
 msgid "Enable"
 msgstr "Slå på"
 
 #: gajim/accounts_window.py:641
-#, fuzzy
 msgid "Port"
-msgstr "_Port:"
+msgstr "Port"
 
 #: gajim/accounts_window.py:646
-#, fuzzy
 msgid "Connection Options"
-msgstr "Tilkobling"
+msgstr "Tilkoblingsvalg"
 
 #: gajim/accounts_window.py:658
-#, fuzzy
 msgid "Encrypted Certificate"
-msgstr "Selvsignert sertifikat"
+msgstr "Kryptert sertifikat"
 
 #: gajim/accounts_window.py:662
-#, fuzzy
 msgid "Certificate Options"
-msgstr "Selvsignert sertifikat"
+msgstr "Sertifikatsvalg"
 
 #: gajim/accounts_window.py:670 gajim/data/gui/join_groupchat_window.ui:143
-#, fuzzy
 msgid "Password"
-msgstr "Passord:"
+msgstr "Passord"
 
 #: gajim/accounts_window.py:674
-#, fuzzy
 msgid "Save Password"
 msgstr "Lagre passord"
 
 #: gajim/accounts_window.py:677 gajim/data/gui/change_password_dialog.ui:8
 msgid "Change Password"
-msgstr "Endre Passord"
+msgstr "Endre passord"
 
 #: gajim/accounts_window.py:682
-#, fuzzy
 msgid "Login Options"
-msgstr "_Uttrykksikoner:"
+msgstr "Innloggingsvalg"
 
 #: 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"
+msgstr "D-Bus finnes ikke på denne maskinen eller python-modulen mangler"
 
 #: gajim/gajim_remote.py:81
 msgid "Shows a help on specific command"
-msgstr "Vis hjelp for en spesifisert kommando"
+msgstr "Viser hjelp vedrørende en gitt kommando"
 
 #: gajim/gajim_remote.py:84
 msgid "command"
@@ -4617,315 +4485,285 @@ msgstr "kommando"
 
 #: gajim/gajim_remote.py:85
 msgid "show help on command"
-msgstr "vis hjelp for kommando"
+msgstr "vis hjelp på kommando"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Vis eller skjul kontaktliste vinduet"
-
-#: 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: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"
+msgstr "Lister opp alle kontakter i kontaktliste, én på hver linje"
 
-#: 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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 msgid "?CLI:account"
-msgstr "konto"
+msgstr "?CLI:konto"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
-msgstr "vis bare kontakter for denne kontoen"
+msgstr "bare vis kontakter tilhørende gitt konto"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
-msgstr "Skriv ut en liste over registrerte kontoer"
+msgstr "Skriver en liste over registrerte kontoer"
 
-#: gajim/gajim_remote.py:109
-#, fuzzy
+#: gajim/gajim_remote.py:101
 msgid "Changes the status of account(s)"
-msgstr "Endrer status på konto eller kontoer"
+msgstr "Endrer status for alle konti"
 
-#: gajim/gajim_remote.py:112
-#, fuzzy
+#: gajim/gajim_remote.py:104
 msgid "?CLI:status"
-msgstr "status"
+msgstr "?CLI:status"
 
-#: gajim/gajim_remote.py:112
-#, fuzzy
+#: gajim/gajim_remote.py:104
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
-"usynlig"
+"usynlig. Hvis ikke satt, bruk kontoens foregående status"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
-#, fuzzy
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 msgid "?CLI:message"
-msgstr "melding"
+msgstr "?CLI:melding"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
-msgstr "status melding"
+msgstr "statusmelding"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 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 ""
-"endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
-"til alle kontoer som har \"synkroniser med global status\" valget påslått"
+"Endre status for kontoen \"konto\". Hvis ikke oppgitt, prøv å endre status "
+"for alle kontoer som har \"synkroniser med global status\" påslått"
 
-#: gajim/gajim_remote.py:120
-#, fuzzy
+#: gajim/gajim_remote.py:112
 msgid "Changes the priority of account(s)"
-msgstr "Endrer prioritet på konto eller kontoer"
+msgstr "Endrer prioritet for alle konti"
 
-#: gajim/gajim_remote.py:122
-#, fuzzy
+#: gajim/gajim_remote.py:114
 msgid "?CLI:priority"
-msgstr "prioritet"
+msgstr "?CLI:prioritet"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
-msgstr "prioritet du ønsker å gi til kontoen"
+msgstr "prioriteten du ønsker å gi kontoen"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 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 ""
-"endre prioritet til en konto. Dersom uspesifisert, endre status til alle "
-"kontoer som har \"synkroniser med global status\" valget påslått"
+"endre prioriteten til den angitte kontoen. Hvis ikke oppgitt, endre status "
+"for alle kontoer som har \"synkroniser med global status\" påslått"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 ""
-"Sender ny samtale melding til en kontakt i kontaktlisten. BÃ¥de OpenPGP "
-"nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
-"'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
+"Sender en ny melding til noen på kontaktlista. Både OpenPGP-nøkkel og konto "
+"er valgfritt. Hvis du ønsker å sette bare 'konto'. uten 'OpenPGP-nøkkel'. "
+"nare sett 'OpenPGP-nøkkel til ''."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
-msgstr "JID til kontakten som vil motta meldingen"
+msgstr "JID-en til kontakten som vil motta meldingen"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
-msgstr "meldings innhold"
+msgstr "meldingsinnhold"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
-msgstr ""
+msgstr "PGP-nøkkel"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
-msgstr ""
-"dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
+msgstr "hvis oppgitt, vil meldingen krypteres med denne offentlige nøkkelen"
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 msgid "if specified, the message will be sent using this account"
-msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
+msgstr "hvis oppgitt, vil meldingen bli sendt ved bruk av denne kontoen"
 
-#: gajim/gajim_remote.py:143
-#, fuzzy
+#: gajim/gajim_remote.py:135
 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 ""
-"Sender ny samtale melding til en kontakt i kontaktlisten. BÃ¥de OpenPGP "
-"nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
-"'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
+"Sender en sludremelding til noen på kontaktlisten din. Alternativt med "
+"OpenPGP-nøkkel og konto. Hvis du ønsker å angi sistnevnte, sett OpenPGP-"
+"nøkkel til \"\"."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
-msgstr "tittel"
+msgstr "tema"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
-msgstr "meldings tittel"
+msgstr "meldingstema"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
-msgstr "Sender nye meldinger to en gruppesamtale som du er tilkoblet."
+msgstr "Sender en ny melding til en gruppesamtale du er i."
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
-msgstr "JID til rommet som vil motta meldingen"
+msgstr "JID-en til rommet som mottar meldingen"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
-msgstr "Henter detaljert informasjon om en kontakt"
+msgstr "Henter detaljert info om en kontakt"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
-msgstr "JID til kontakten"
+msgstr "JID-en til kontakten"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
-msgstr "Henter detaljert informasjon om en konto"
+msgstr "Henter detaljert info om en konto"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "fil"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
-msgstr "Fil sti"
+msgstr "Mappe"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
-msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
+msgstr "hvis oppgitt vil fila bli sendt ved bruk av denne kontoen"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
-msgstr "Viser alle innstillingsmuligheter og gjeldende verdier"
+msgstr "Lister alle innstillinger og deres verdier"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
-msgstr "Setter verdien av 'nøkkel' til 'verdi',"
+msgstr "Setter verdien av 'nøkkel' til 'verdi'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: gajim/gajim_remote.py:193
-#, fuzzy
+#: gajim/gajim_remote.py:185
 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
-msgstr "Sletter en innstilling"
+msgstr "Sletter et element fra egenskaper"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "nøkkel"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "navnet på innstillingen som skal slettes"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
-msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
+msgstr "Skriver nåværende tilstand for Gajim-egenskaper til .config-fila"
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
-msgstr "Fjerner kontakt fra kontaktlisten"
+msgstr "Fjerner kontakt fra kontaktliste"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
-msgstr "om spesifisert vil kontakten fjernes fra listen på denne kontoen"
+msgstr "hvis oppgitt tas kontakten fra kontaktlista tilhørende denne kontoen"
 
-#: gajim/gajim_remote.py:219
+#: gajim/gajim_remote.py:211
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
-"Returnerer innstillinger (globale innstillinger om ikke en konto er "
-"spesifisert)"
+"Viser nåværende status (for alt, med mindre konto-spesifikk er oppgitt)"
 
-#: gajim/gajim_remote.py:226
+#: gajim/gajim_remote.py:218
 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)"
+"Viser gjeldende statusmelding (for alt, med mindre konto-spesifikk er "
+"oppgitt)"
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
-msgstr "Returnerer antall uleste meldinger"
+msgstr "Viser antall uleste meldinger"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
-msgstr "Send egendefinert XML"
+msgstr "Sender egendefinert XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
-msgstr "XML for sending"
+msgstr "XML å sende"
 
-#: gajim/gajim_remote.py:241
-#, fuzzy
+#: gajim/gajim_remote.py:233
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr ""
-"Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
-"til alle kontoer"
+"Kontoen XML-en vil bli sendt til; hvis ikke angitt, vil XML-en sendes til "
+"alle kontoer"
 
-#: gajim/gajim_remote.py:247
-#, fuzzy
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
-msgstr "Endre status"
+msgstr "Endre avataren"
 
-#: gajim/gajim_remote.py:249
-#, fuzzy
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
-msgstr "Kallenavn å bruke"
+msgstr "Bilde å bruke"
 
-#: gajim/gajim_remote.py:250
-#, fuzzy
+#: gajim/gajim_remote.py:242
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
 msgstr ""
-"Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
-"til alle kontoer"
+"Kontoen avataren vil bli valgt for; hvis ikke oppgitt vil avataren bli valgt "
+"for alle kontoer"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Sjekk om Gajim kjører"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Vis eller skjul ipython vindu"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
-msgstr "Mangler argument \"contact_jid\""
+msgstr "Mangler argumentet \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
-"'%s' er ikke in kontaktlisten din.\n"
-"Vennligst spesifiser konto for sending av meldingen."
+"'%s' er ikke å finne på din kontaktliste.\n"
+"Oppgi konto for forsendelse av melding."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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. "
+msgstr "Det later til at Gajim ikke kjører. Så du kan ikke bruke gajim-remote."
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4934,47 +4772,49 @@ msgstr ""
 "Bruk: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: gajim/gajim_remote.py:399
-#, fuzzy, python-format
+#: gajim/gajim_remote.py:387
+#, python-format
 msgid ""
 "Usage:\n"
 "  %s command [arguments]\n"
 "\n"
 "Command is one of:\n"
 msgstr ""
-"Bruk: %s kommando [argumenter]\n"
-"Kommando er en av:\n"
+"Bruk:\n"
+"  %s command [arguments]\n"
+"\n"
+"Kommandoen er en av følgende:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "For mange argumenter. \n"
-"Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
+"Skriv \"%(basename)s help %(command)s\" for mer informasjon"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
-"Argumentet \"%(arg)s\" er ikke spesifisert. \n"
-"Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
+"Argumentet \"%(arg)s\" er ikke oppgitt. \n"
+"Skriv \"%(basename)s help %(command)s\" for mer info"
 
 #: gajim/common/app.py:263
 msgid "Unable to load idle module"
-msgstr "Klarer ikke å uvirksom modulen"
+msgstr "Klarer ikke å laste inn uvirksom modul"
 
 #: gajim/common/fuzzyclock.py:37
 msgid "twelve"
@@ -4982,7 +4822,7 @@ msgstr "tolv"
 
 #: gajim/common/fuzzyclock.py:37
 msgid "one"
-msgstr "en"
+msgstr "ett"
 
 #: gajim/common/fuzzyclock.py:37
 msgid "two"
@@ -5047,17 +4887,17 @@ msgstr "kvart over %(0)s"
 #: gajim/common/fuzzyclock.py:44
 #, python-format
 msgid "twenty past %(0)s"
-msgstr "ti på halv %(1)s"
+msgstr "ti på halv %(0)s"
 
 #: gajim/common/fuzzyclock.py:44
 #, python-format
 msgid "twenty five past %(0)s"
-msgstr "fem på halv %(1)s"
+msgstr "fem på halv %(0)s"
 
 #: gajim/common/fuzzyclock.py:45
 #, python-format
 msgid "half past %(0)s"
-msgstr "halv %(1)s"
+msgstr "halv %(0)s"
 
 #: gajim/common/fuzzyclock.py:45
 #, python-format
@@ -5123,106 +4963,108 @@ msgstr "Sen kveld"
 
 #: gajim/common/fuzzyclock.py:52
 msgid "Start of week"
-msgstr "Starten av uken"
+msgstr "Starten av uka"
 
 #: gajim/common/fuzzyclock.py:52 gajim/common/fuzzyclock.py:53
 msgid "Middle of week"
-msgstr "Midten av uken"
+msgstr "Midti uka"
 
 #: gajim/common/fuzzyclock.py:53
 msgid "End of week"
-msgstr "Slutten av uken"
+msgstr "Slutten av uka"
 
 #: gajim/common/fuzzyclock.py:53
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, 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 ""
-"JID %s er ikke RFC kompatibel. Den vil ikke bli lagt til kontaktlisten. Bruk "
-"kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ for å "
-"fjerne den"
+"JID-en %s er ikke RFC-kompatibel. Den vil ikke bli lagt til i kontaktlisten. "
+"Bruk kontaktlisteadministrasjons-verktøy som http://jru.jabberstudio.org/ "
+"for å fjerne den"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
-msgstr "frakoblings ønske fra %s"
+msgstr "frakoblingsforespørsel fra %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
-msgstr "Rommet har blitt ødelagt"
+msgstr "Rommet har blitt kansellert"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
-msgstr "Du kan bli med i dette rommet isteden: %s"
+msgstr "Du kan bli med i dette rommet i steden for: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
-msgstr "Ukjent SSL feil: %d"
+msgstr "Ukjent SSL-feil: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
-msgstr "Ny Enkeltmelding fra %(nickname)s"
+msgstr "Ny enkeltmelding fra %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
-msgstr "Ny Privat Melding fra gruppesamtalerom %s"
+msgstr "Ny privat melding fra gruppesamtalerom %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Melding fra %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
-msgstr "Ny Melding fra %(nickname)s"
+msgstr "Ny melding fra %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
-msgstr "%(nick)s Endret Status"
+msgstr "%(nick)s endret status"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s Logget PÃ¥"
+msgstr "%(nickname)s logget inn"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s Logget Av"
+msgstr "%(nickname)s logget ut"
 
 #: gajim/common/contacts.py:386
 msgid "Not in roster"
-msgstr "ikke i kontaktliste"
+msgstr "Ikke i kontaktliste"
 
 #: gajim/common/config.py:76
 msgid ""
 "Show desktop notification even when a chat window is opened for this contact "
 "and does not have focus"
 msgstr ""
+"Vis skrivebordsmerknad selv når et sludrevindu åpnes for denne kontakten og "
+"ikke har fokus"
 
 #: gajim/common/config.py:77
 msgid "Play sound when user is busy"
-msgstr "Lag lyd når bruker er opptatt"
+msgstr "Lag lyd når brukeren er opptatt"
 
 #: gajim/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
-msgstr "Vis bare tilkoblede og ledig for samtale kontakter i kontaktlisten. "
+msgstr "Vis bare tilkoblede og kontakter ledig for prat i kontaktlisten."
 
 #: gajim/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
@@ -5230,132 +5072,124 @@ msgstr "Tid i minutter før status endres til borte."
 
 #: gajim/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
-msgstr "$S (Borte på grunn av inaktivitet i mer enn $T min)"
+msgstr "$S (Borte på grunn av uvirksomhet i mer enn $T min)"
 
 #: gajim/common/config.py:83
-#, fuzzy
 msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr ""
-"$S vil bli byttet ut med gjeldende status melding, $T av automatisk borte "
-"tid. "
+"$S vil bli erstattet av gjeldende statusmelding, $T av automatisk borte-tid."
 
 #: gajim/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
-msgstr "Tid i minutter før status endres til ikke tilgjengelig."
+msgstr "Tid i minutter før status endres til 'Ikke tilgjengelig'."
 
 #: gajim/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
-msgstr "$S (Ikke tilgjengelig på grunn av inaktivitet i mer enn $T min)"
+msgstr "$S (Ikke tilgjengelig på grunn av uvirksomhet i mer enn $T min)"
 
 #: gajim/common/config.py:86
-#, fuzzy
 msgid "$S will be replaced by current status message, $T by autoxatime."
-msgstr "$S vil bli byttet ut med gjeldende status melding, $T av auoxa tid."
+msgstr "$S vil erstattes av gjeldende statusmelding, $T av lengre tids fravær."
 
 #: gajim/common/config.py:89
-#, fuzzy
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
-"Når skal systemikon vises. Kan være 'aldri', 'ved_hendelse', 'alltid'. "
+"Når skal merknad i merknadsfelt vises. Kan være 'aldri', 'ved_hendelse', "
+"'alltid'."
 
 #: gajim/common/config.py:90
 msgid "Allow to hide the roster window even if the tray icon is not shown."
 msgstr ""
+"Tillat skjuling av kontaktvindu selv når systemkurv-miniatyrbildet ikke "
+"vises."
 
 #: gajim/common/config.py:95
 msgid "Incoming nickname color."
-msgstr "Innkommende kallenavns farge."
+msgstr "Innkommende kallenavnsfarge."
 
 #: gajim/common/config.py:96
 msgid "Outgoing nickname color."
-msgstr "Utgående kallenavn farge."
+msgstr "Utgående kallenavnfarge."
 
 #: gajim/common/config.py:97
 msgid "Incoming text color."
-msgstr "Innkommende tekst farge."
+msgstr "Innkommende tekstfarge."
 
 #: gajim/common/config.py:98
 msgid "Outgoing text color."
-msgstr "Utgående tekst farge."
+msgstr "Utgående tekstfarge."
 
 #: gajim/common/config.py:99
 msgid "Status message text color."
-msgstr "Status meldings tekst farge."
+msgstr "Statusmeldingers tekstfarge."
 
 #: gajim/common/config.py:102
-#, fuzzy
 msgid "Contact signed in notification color."
-msgstr "_Vis hendelse i kontaktliste"
+msgstr "Merknadsfarge for kontaktinnlogging."
 
 #: gajim/common/config.py:103
-#, fuzzy
 msgid "Contact signout notification color"
-msgstr "_Vis hendelse i kontaktliste"
+msgstr "Merknadsfarge for kontaktavlogging"
 
 #: gajim/common/config.py:104
-#, fuzzy
 msgid "New message notification color."
-msgstr "Forhåndsvik nye meldinger i popup vindu?"
+msgstr "Ny meldingsmerknadsfarge."
 
 #: gajim/common/config.py:105
-#, fuzzy
 msgid "File transfer request notification color."
-msgstr "Fil Overførings Forespørsel"
+msgstr "Merknadsfarge for filoverføringsforespørsler."
 
 #: gajim/common/config.py:106
-#, fuzzy
 msgid "File transfer error notification color."
-msgstr "Fil overføring avbrutt"
+msgstr "Merknadsfarge for filoverføringsfeil."
 
 #: gajim/common/config.py:107
-#, fuzzy
 msgid "File transfer complete or stopped notification color."
-msgstr "Når en fil overføring er komplett vis en sprettopp informasjon"
+msgstr "Merknadsfarge når overføring fullføres eller stoppes."
 
 #: gajim/common/config.py:108
-#, fuzzy
 msgid "Groupchat invitation notification color"
-msgstr "Gruppesamtale invitasjon"
+msgstr "Merknadsfarge for invitasjon til gruppesamtale"
 
 #: gajim/common/config.py:109
-#, fuzzy
 msgid "Background color of status changed notification"
-msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget på."
+msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget på"
 
 #: gajim/common/config.py:110
 msgid "Other dialogs color."
-msgstr ""
+msgstr "Farge for andre dialoger."
 
 #: gajim/common/config.py:111
 msgid "Incoming nickname font."
-msgstr "Innkommende kallenavns font."
+msgstr "Skrift brukt for innkommende kallenavn."
 
 #: gajim/common/config.py:112
 msgid "Outgoing nickname font."
-msgstr "Utgående kallenavns font."
+msgstr "Skrift brukt for utgående kallenavn."
 
 #: gajim/common/config.py:113
 msgid "Incoming text font."
-msgstr "Innkommende tekst font."
+msgstr "Innkommende tekstskrift."
 
 #: gajim/common/config.py:114
 msgid "Outgoing text font."
-msgstr "Utgående tekst font."
+msgstr "Utgående tekstskrift."
 
 #: gajim/common/config.py:115
 msgid "Status message text font."
-msgstr "Status meldings tekst font."
+msgstr "Tekstskrift for statusmeldinger."
 
 #: gajim/common/config.py:116
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
-"Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
+"Liste (inndelt med mellomrom) av rader (kontoer og grupper) som er foldet "
+"sammen."
 
 #: gajim/common/config.py:123
 msgid "Language used by speller"
-msgstr "Språk som brukes av ordlisten"
+msgstr "Språk brukt av staveren"
 
 #: gajim/common/config.py:124
 msgid ""
@@ -5363,9 +5197,9 @@ msgid ""
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
-"'always' - vis klokkeslett for hver melding.\n"
-"'sometimes' - vis klokkeslett hvert print_ichat_every_foo_minutes minutt.\n"
-"'never' - aldri vis klokkeslett."
+"'alltid' - vis klokkeslett for hver melding.\n"
+"'noen ganger' - vis klokkeslett hvert print_ichat_every_foo_minutes minutt.\n"
+"'aldri' - aldri vis klokkeslett."
 
 #: gajim/common/config.py:125
 msgid ""
@@ -5373,24 +5207,23 @@ msgid ""
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
-"Skriv klokkeslett i samtaler med Fuzzy Clock. Verdien av fuzziness fra 1 til "
-"4, eller 0 for å deaktivere fuzzyclock. 1 er den mest presise klokken, 4 er "
-"den mindre presise. Dette brukes bare dersom print_time er 'sometimes'."
+"Skriv klokkeslett i samtaler med fuzzyclock. Verdien av fuzziness oppgis fra "
+"1 til 4, eller 0 for å skru av fuzzyclock. 1 er den mest presise klokken, 4 "
+"er den minst presise. Dette brukes bare dersom print_time er 'noen ganger'."
 
 #: gajim/common/config.py:127
-#, fuzzy
 msgid "Enable ASCII emoticons"
-msgstr "Behandle Uttrykksikoner"
+msgstr "Skru på ASCII-smilefjes"
 
 #: gajim/common/config.py:129
 msgid "Treat * / _ pairs as possible formatting characters."
-msgstr "Behandle * / _ par som mulige formaterings symboler."
+msgstr "Behandle * / _-par som mulig inndeling av formateringstegn."
 
 #: gajim/common/config.py:130
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
-"Dersom True, ikke fjern */_ . SÃ¥ *abc* vil bli uthevet men * * ikke vil bli "
+"Dersom sant, ikke fjern */_ . Slik at *abc* vil bli uthevet men * * ikke "
 "fjernet."
 
 #: gajim/common/config.py:133
@@ -5399,8 +5232,8 @@ msgid ""
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
-"Bruker ReStrukturert tekstoppmerking for å sende HTML, samt ascii "
-"formatering dersom valgt. For syntax, se http://docutils.sourceforge.net/"
+"Bruker ReStrukturert tekstoppmerking for å sende HTML, samt ASCII-"
+"formatering, dersom valgt. For syntaks, se http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html (Dersom du ønsker å bruke dette, må du "
 "installere docutils)"
 
@@ -5409,7 +5242,7 @@ msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
-"Tegn å legge til etter kallenavn når du bruker kallenavn fullføring (tab) i "
+"Tegn å legge til etter kallenavn ved bruk av kallenavns-fullføring (tab) i "
 "gruppesamtaler."
 
 #: gajim/common/config.py:143
@@ -5417,18 +5250,20 @@ msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr ""
-"Tegnforslag å legge til nytt kallenavn når det ønskede kallenavnet er "
-"opptatt av noen andre i samtalegruppen."
+"Tegnforslag å legge til etter ønsket kallenavn når det ønskede kallenavnet "
+"brukes av noen andre i samtalegruppen."
 
 #: gajim/common/config.py:165
 msgid ""
 "If True, Gajim will save roster position when hiding roster, and restore it "
 "when showing roster."
 msgstr ""
+"Hvis sant vil Gajim lagre kontaktlisteposisjon når den blir skjult, og "
+"gjennoprette den når den vises."
 
 #: gajim/common/config.py:171
 msgid "Place the roster on the right in single window mode"
-msgstr ""
+msgstr "Plasser kontaktlisten til høyre i enkeltvindusmodus"
 
 #: gajim/common/config.py:177
 msgid ""
@@ -5436,10 +5271,10 @@ msgid ""
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
-"Dette valget lar deg endre tidsformatet som skrives i samtaler. For eksempel "
-"\"[%H:%M] \" vil vise \"[hour:minute] \". Se python dokumentasjon på "
-"strftime for å se fullstendig beskrivelse: http://docs.python.org/lib/module-"
-"time.html"
+"Dette valget lar deg endre tidsformatet som stemples i samtaler. For "
+"eksempel \"[%H:%M] \" vil vise \"[time:minutt] \". Se python-dokumentasjon "
+"på strftime for å en fullstendig beskrivelse: http://docs.python.org/lib/"
+"module-time.html"
 
 #: gajim/common/config.py:178
 msgid "Characters that are printed before the nickname in conversations"
@@ -5451,88 +5286,91 @@ msgstr "Tegn som skrives etter kallenavnet i samtaler"
 
 #: gajim/common/config.py:181
 msgid "Add * and [n] in roster title?"
-msgstr "Legg til * og [n] inn i kontaktliste tittelen?"
+msgstr "Legg til * og [n] i kontaktlistens tittel?"
 
 #: gajim/common/config.py:182
-#, fuzzy
 msgid ""
 "How many history messages should be restored when a chat tab/window is "
 "reopened?"
 msgstr ""
-"Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
-"blir åpnet på nytt."
+"Hvor mange meldinger skal gjenopprettes fra historikk når en samtale "
+"gjenåpnes?"
 
 #: gajim/common/config.py:183
 msgid "How far back in time (minutes) history is restored. -1 means no limit."
 msgstr ""
+"Hvor langt tilbake (i minutter) historikk skal gjenopprettes. -1 betyr ingen "
+"grense."
 
 #: gajim/common/config.py:184
-#, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit"
 msgstr ""
-"Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale."
+"Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale. -1 "
+"betyr ingen øvre grense"
 
 #: gajim/common/config.py:185
-#, fuzzy
 msgid ""
 "Minutes of backlog to request when entering a groupchat. -1 means no limit"
 msgstr ""
-"Hvor mange minutter med logg skal man be om når man går inn i en "
-"gruppesamtale. "
+"Hvor mange minutter med logg skal forespørres ved inntreden i "
+"gruppesludring. -1 betyr ingen grense"
 
 #: gajim/common/config.py:186
 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 ""
-"Hvor mange sekunder skal man venter før man prøver en automatisk re-"
-"tilkobling til en samtale som du har blitt frakoblet. Sett til 0 for "
-"deaktiver automatisk re-tilkobling"
+"Hvor mange sekunder skal man vente før automatisk ny tilkobling til en "
+"samtale som du har blitt koblet fra forsøkes. Sett til 0 for å skru av "
+"automatisk ny tilkobling."
 
 #: gajim/common/config.py:187
 msgid ""
 "Should autorejoin be activated when we are being kicked from a conference?"
 msgstr ""
+"Burde automatisk deltagelse bli påslått når du kastes ut av en konferanse?"
 
 #: gajim/common/config.py:188
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr ""
-"Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
-"Klient standard oppførsel)."
+"Send meldinger med Ctrl+Enter og lag ny linje med Enter (ICQ-klientens "
+"Mirabilis standardoppførsel)."
 
 #: gajim/common/config.py:190
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
 #: 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 ""
-"Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
-"'WIKTIONARY' som betyr bruk wiktionary."
+"Enten bruk egendefinert nettadresse med %s i seg, hvor %s er ordet/frasen "
+"eller 'WIKTIONARY' som betyr bruk Wiktionary."
 
 #: gajim/common/config.py:196
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
+msgstr "Dersom valgt vil Gajim kunne fjernstyres med gajim-remote."
 
 #: gajim/common/config.py:197
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Sendt samtale status melding. Kan være alle, bare_skriving, avslått."
+msgstr ""
+"Sendt merknad for samtalestatus. Kan være 'alle', 'bare_skriving' eller "
+"'avslått'."
 
 #: gajim/common/config.py:198
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
-"Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, "
-"avslått."
+"Vist melding for samtalestatus i samtalevindu. Kan være 'alle', "
+"'bare_skriving' eller 'avslått'."
 
 #: gajim/common/config.py:200
 msgid ""
@@ -5547,67 +5385,66 @@ msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
 #: 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 ""
-"Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom "
-"separerte listen av rom jider."
+"Alltid spør om bekreftelse før gruppesludringer med noen av JID-ene på denne "
+"mellomromsinndelte listen lukkes."
 
 #: 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 ""
-"Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms "
-"separerte listen av rom jider."
+"Aldri spør om bekreftelse før gruppesludringer med noen av JID-ene på denne "
+"mellomromsinndelte listen lukkes."
 
 #: gajim/common/config.py:204
-#, fuzzy
 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 ""
-"Spør før lukking av fanet samtalevindu dersom det er kontrol som kan miste "
-"data (samtale, privat samtale, gruppesamtaler vil ikke bli minimert)"
+"Spør før samtalefaner lukkes hvis data kan gå tapt (samtaler, private "
+"samtaler, gruppesamtaler som ikke minimeres)"
 
 #: gajim/common/config.py:207
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 msgstr ""
-"Komma separert liste over maskiner som vi sender, i tillegg til lokale "
-"grensesnitt, for Fil Overføring i tilfelle adresse oversetting/port "
+"Komma-inndelt liste over maskiner som vi sender, i tillegg til lokale "
+"grensesnitt, for filoverføring i tilfelle adresseoversetting/port-"
 "videresending."
 
 #: gajim/common/config.py:209
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "IEC-standarden tilsier at KiB = 1024 bytes, KB = 1000 bytes."
 
 #: gajim/common/config.py:211
-#, fuzzy
 msgid "Notify of events in the notification area."
-msgstr "Varsle om hendelser i system-statusfelt ikonet."
+msgstr "Varsle om hendelser i system-statusfeltområdet."
 
 #: gajim/common/config.py:212
 msgid ""
 "If False, Gajim will display a static event icon instead of the blinking "
 "status icon in the notification area when notifying on event."
 msgstr ""
+"Hvis usant, vil Gajim vise et satisk hendelsesminiatyrbilde, i steden for "
+"blinkende status i merknadsområdet når det blir gjort oppmerksom på en "
+"hendelse."
 
 #: gajim/common/config.py:218
 msgid "Show tab when only one conversation?"
-msgstr "Vis fane når du har bare en samtale?"
+msgstr "Vis fane når du har bare én samtale?"
 
 #: gajim/common/config.py:219
 msgid "Show tabbed notebook border in chat windows?"
-msgstr "Vis notatblokk faner i samtalevinduer?"
+msgstr "Vis fanet notatblokk i samtalevinduer?"
 
 #: gajim/common/config.py:220
 msgid "Show close button in tab?"
-msgstr "Vis lukk knapp på fanen?"
+msgstr "Vis lukkingsknapp på fanen?"
 
 #: gajim/common/config.py:221
 msgid ""
@@ -5616,65 +5453,68 @@ msgid ""
 "numbers are more secure, but take longer to calculate when you start a "
 "session."
 msgstr ""
-"En liste av modp grupper til å bruke i en Fiffie-Hellman, prioritert liste, "
-"separert med komma. Gyldige grupper er 1, 2, 5, 14, 15, 16, 17 og 18. Høyere "
-"nummer er mer sikre men tar lenger å kalkulere når du starter en sesjon. "
+"En liste av modp-grupper til å bruke i en Diffie-Hellman, høyest prioritet "
+"først, inndelt med komma. Gyldige grupper er 1, 2, 5, 14, 15, 16, 17 og 18. "
+"Høyere nummer er sikrere, men tar lenger å kalkulere når du starter ei økt."
 
 #: gajim/common/config.py:234
 msgid "Preview new messages in notification popup?"
-msgstr "Forhåndsvik nye meldinger i popup vindu?"
+msgstr "Forhåndsvis nye meldinger i oppsprettsvindu?"
 
 #: gajim/common/config.py:237
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtaler."
+msgstr ""
+"En semikoloninndelt liste over ord som vil bli uthevet i gruppesamtaler."
 
 #: gajim/common/config.py:238
-#, fuzzy
 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 ""
-"Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket "
-"på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
+"Dersom sant vil Gajim avslutte når X-knappen i vindusbehandleren blir "
+"trykket. Det blir kun tatt hensyn til dette dersom systemstatus-"
+"miniatyrbilde er i bruk."
 
 #: gajim/common/config.py:239
 msgid ""
 "If True, Gajim hides the Roster window on pressing the X button instead of "
 "minimizing into the Dock."
 msgstr ""
+"Skjuler kontaktlistevinduet i Gajim ved å trykke på X-knappen istedenfor "
+"minimering til dokken."
 
 #: gajim/common/config.py:240
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 msgstr ""
-"Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
-"meldinger. Avhengig av valgte tema kan dette ikonet være animert."
+"Hvis sant vil Gajim vise et miniatyrbilde på hver fane som inneholder uleste "
+"meldinger. Avhengig av valgt tema kan dette være animert."
 
 #: gajim/common/config.py:241
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
 msgstr ""
-"Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
-"kontakt under kontaktens navn i kontaktliste vinduet."
+"Hvis sant vil Gajim vise statusmeldingen, om den ikke er tom, for hver "
+"kontakt under kontaktens navn i kontaktlistevinduet."
 
 #: gajim/common/config.py:247
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
-"Definer posisjo for avatar i kontaktlisten. Kan være venste eller høyre"
+"Bestemmer posisjon for avataren i kontaktlisten. Kan være til venste eller "
+"høyre"
 
 #: gajim/common/config.py:248
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
 msgstr ""
-"Dersom False vil du ikke lenger kunne se status linjer i samtaler når en "
-"kontakt endrer hans eller hennes status og/eller status melding. "
+"Hvis usant vil du ikke lenger kunne se statuslinjer i samtaler når en "
+"kontakt endrer status og/eller statusmelding."
 
 #: gajim/common/config.py:249
-#, fuzzy
 msgid ""
 "Can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -5682,32 +5522,33 @@ msgid ""
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
 "group chat."
 msgstr ""
-"kan være \"none\",\"all\" eller \"in_and_out\". Dersom \"none\" vil Gajim "
-"ikke lenger vise status linje i gruppesamtaler når et medlem endrer hans/"
-"hennes status melding. Dersom \"all\" vil Gajim vise alle status meldinger. "
-"Dersom \"in_and_out\" vil Gajim bare vise FOO kommer/drar fra gruppesamtalen."
+"Kan være \"ingen\" eller \"inn_og_ut\". Hvis \"ingen\", vil Gajim ikke "
+"lenger skrive statuslinjer i gruppesamtaler når et medlem endrer sin status "
+"og/eller statusmelding. Hvis \"alle\" vil Gajim skrive alle statusmeldinger. "
+"Hvis \"in_og_ut\", vil Gajim bare skrive FOO tar del i/forlater "
+"gruppesamtale."
 
 #: gajim/common/config.py:251
 msgid "Log XHTML messages instead of plain text messages."
-msgstr ""
+msgstr "Loggfør XHTML-meldinger isteden for klartekst-meldinger."
 
 #: gajim/common/config.py:252
 msgid "Background color of contacts when they just signed in."
-msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget på."
+msgstr "Bakgrunnsfarge for kontakter som akkurat har logget på."
 
 #: gajim/common/config.py:253
 msgid "Background color of contacts when they just signed out."
-msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget ut."
+msgstr "Bakgrunnsfarge for kontakter som akkurat har logget ut."
 
 #: gajim/common/config.py:255
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
-"Dersom True vil gjenopprettede meldinger bruke en mindre font en standard."
+"Hvis sant vil gjenopprettede meldinger bruke en mindre font enn forvalget."
 
 #: gajim/common/config.py:256
 msgid "Don't show avatar for the transport itself."
-msgstr "Ikke vis kontaktbilde for transporten selv."
+msgstr "Ikke vis avatar for selve transporten."
 
 #: gajim/common/config.py:257
 msgid "Don't show roster in the system taskbar."
@@ -5719,9 +5560,9 @@ msgid ""
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
-"Dersom True og de installerte GTK+ og PyGTK versjonene er minst 2.8, vil "
+"Hvis sant og de installerte GTK+ og PyGTK-versjonene er minst 2.8, vil "
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
-"det er ventende hendelser."
+"det er hendelser på vent."
 
 #: gajim/common/config.py:260
 msgid ""
@@ -5729,12 +5570,11 @@ msgid ""
 "chat. Turn this option to False to stop sending sha info in group chat "
 "presences."
 msgstr ""
-"Jabberd1.4 liker ikke sha informasjon når man går inn i et passord beskyttet "
-"samtalerom. Sett dette valget til False for å slutte å sende sha informasjon "
-"til gruppesamtaler"
+"Jabberd1.4 liker ikke SHA-informasjon når man går inn i et passordbeskyttet "
+"samtalerom. Sett dette valget til usant for å slutte å sende SHA-informasjon "
+"til gruppesamtaler."
 
 #: gajim/common/config.py:263
-#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5745,15 +5585,14 @@ msgid ""
 "'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
-"Kontrollerer vinduet hvor nye meldinger skal plasseres.\n"
-"'always' - Alle meldinger sendes til ett vindu.\n"
-"'always_with_roster' - Lik 'always' men meldingene er i ett vindu sammen med "
-"kontaktlisten.\n"
-"'never' - Alle meldinger får egne vindu.\n"
-"'peracct' - Meldinger for hver konto sendes til egne vindu.\n"
-"'pertype' - Hver meldingstype (f.eks., samtaler og gruppesamtaler) sendes "
-"til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
-"Gajim før det aktiveres"
+"Kontrollerer vinduet der nye meldinger plasseres.\n"
+"'always' - Alle meldinger blir sendt til ett enkelt vindu.\n"
+"'always_with_roster' - Som 'always', men meldingene er i ett enkelt vindu, "
+"sammen med kontaktlista.\n"
+"'never' - Alle meldinger i eget vindu.\n"
+"'peracct' - Meldinger for hver konto sendes til et spesifikt vindu.\n"
+"'pertype' - Hver meldingstype (f.eks. sludreøkter, men ikke "
+"gruppesludringsøkter) blir sendt til et spesifikt vindu."
 
 #: gajim/common/config.py:264
 msgid ""
@@ -5762,46 +5601,50 @@ msgid ""
 "'never' - Never show roster.\n"
 "'last_state' - Restore the last state roster."
 msgstr ""
+"Vis kontaktliste ved oppstart.\n"
+"'alltid' - Aldri vis kontaktliste.\n"
+"'aldri' - Never show roster.\n"
+"'siste_tilstand' - Gjenopprett kontaktlisten i siste tilstand."
 
 #: gajim/common/config.py:265
 msgid "If False, you will no longer see the avatar in the chat window."
-msgstr "Dersom False vil du ikke lenger se bildeikoner i samtalevinduet."
+msgstr "Hvis usant vil du ikke lenger se avataren i samtalevinduet."
 
 #: gajim/common/config.py:266
 msgid "If True, pressing the escape key closes a tab/window."
-msgstr "Dersom True vil man kunne lukke fane/vindu med escape knappen."
+msgstr "Hvis sant vil man kunne lukke fane/vindu med Esc-knappen."
 
 #: gajim/common/config.py:267
 msgid "Hides the banner in a group chat window"
-msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
+msgstr "Gjemmer tittelbanneret i gruppesamtalevinduer"
 
 #: gajim/common/config.py:268
 msgid "Hides the banner in two persons chat window"
-msgstr "Gjemmer tittel banneret i to personers samtale vindu"
+msgstr "Gjemmer tittelbanneret i samtalevindu mellom to parter"
 
 #: gajim/common/config.py:269
 msgid "Hides the group chat occupants list in group chat window."
-msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
+msgstr "Gjemmer rommets deltagerliste i gruppesamtalevinduet."
 
 #: gajim/common/config.py:270
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 msgstr ""
-"I en samtale, vis kallenavnet i starten av linjen bare når det ikke er den "
-"samme person som snakker som i den forrige meldingen."
+"I en samtale, vis kallenavnet i starten av linjen bare når det ikke er samme "
+"person som snakker som i foregående melding."
 
 #: gajim/common/config.py:271
 msgid "Indentation when using merge consecutive nickname."
-msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
+msgstr "Innrykk når man bruker sammenslåing av påfallende kallenavn."
 
 #: gajim/common/config.py:272
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr ""
-"Liste av farger, separert av \":\", som vil bli brukt til å farge kallenavn "
-"i gruppesamtaler."
+"Liste av farger, inndelt av \":\", brukt til å farge kallenavn i "
+"gruppesamtaler."
 
 #: gajim/common/config.py:273
 msgid "Ctrl-Tab go to next composing tab when none is unread."
@@ -5812,24 +5655,24 @@ msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr ""
-"Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
-"innhold mener at vi aldri viser dialogen."
+"Skal bekreftelse av metakontaktopprettings-dialog vises eller ei? Tomt "
+"innhold betyr at dialogen aldri vises."
 
 #: gajim/common/config.py:275
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"Skal vi vise bekrefte blokk kontakt dialog eller ikke? Tomt tekststreng "
-"betyr at vi aldri viser dialogen."
+"Skal bekreftelse av kontaktblokkering vises eller ei? Tomt innhold betyr at "
+"dialogen aldri vises."
 
 #: 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 ""
-"Skal vi vise bekrefte egendefinert status dialog eller ikke? Tomt "
-"tekststreng betyr at vi aldri viser dialogen."
+"Skal bekreftelse av egendefinert status -dialog vises eller ei? Tomt innhold "
+"betyr at dialogen aldri vises."
 
 #: gajim/common/config.py:277
 msgid ""
@@ -5837,37 +5680,37 @@ 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 ""
-"Dersom True vil du kunne sette en negativ prioritet til din konto i "
+"Hvis sant vil du kunne sette negativ prioritet for din konto i "
 "kontoinnstillingene. VÆR FORSIKTIG, når du er logget inn med en negativ "
-"prioritet vil du ikke motta noen meldinger fra din server."
+"prioritet vil du ikke motta noen meldinger fra din tjener."
 
 #: gajim/common/config.py:278
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
-"Dersom True vil Gajim vise antall tilgjengelige og totalt antall kontakter "
-"og gruppe rader. "
+"Hvis sant vil Gajim vise antall tilgjengelige og totalt antall kontakter og "
+"grupperader."
 
 #: gajim/common/config.py:279
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
-"Kan være tom, 'chat' eller 'normal'. Dersom ikke tom, behandle alle "
-"innkommende meldinger som om de var av denne typen."
+"Kan være tom, 'samtale' eller 'normal'. Dersom den ikke er tom, behandles "
+"alle innkommende meldinger som om de var av denne typen."
 
 #: gajim/common/config.py:280
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
-"Dersom True vil Gajim skrolle og velge kontakten som sendte deg siste "
-"melding, om ikke samtalevinduet allerede er åpnet. "
+"Hvis sant vil Gajim rulle og velge kontakten som sist sendte deg en melding, "
+"om ikke samtalevinduet allerede er åpnet."
 
 #: gajim/common/config.py:281
 msgid "Time of inactivity needed before the change status window closes down."
-msgstr "Tif med inaktivitet som behøves før endre status vinduet lukkes."
+msgstr "Tid med inaktivitet før vinduet for endring av status lukkes."
 
 #: gajim/common/config.py:282
 msgid ""
@@ -5877,164 +5720,173 @@ msgstr ""
 "Maksimalt antall linjer som vises i samtaler. De eldste linjene fjernes."
 
 #: gajim/common/config.py:283
-#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
-"Dersom True vil kunngjøringsvinduer fra notification-deamon bli festet til "
-"systray ikonet."
+"Hvis sant vil kunngjøringsvinduer fra merknads-nissen bli festet til "
+"miniatyrbildet i systemkurven."
 
 #: gajim/common/config.py:284
 msgid "Choose interval between 2 checks of idleness."
-msgstr "Velg intervall mellom 2 punkter av ledighet."
+msgstr "Velg intervall mellom to uvirksomhetssjekker."
 
 #: gajim/common/config.py:285
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
 msgstr ""
-"Lovlige uri skjema. Bare skjema i denne listen vil bli aksepterte som en "
-"\"ekte\" uri. (mailto og xmpp håndteres separat)"
+"Lovlige URI-handlesett. Bare skjema i denne listen vil bli akseptert som en "
+"\"ekte\" URI. (mailto og xmpp håndteres separat)"
 
 #: gajim/common/config.py:286
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
-"Dersom True, vil komplettering i samtalerom gjøres slik som shell basert "
-"komplettering."
+"Hvis sant vil komplettering i samtalerom gjøres slik som i skallbasert "
+"variant"
 
 #: gajim/common/config.py:287
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
-"Når skal selv kontakt raden vises. Kan være \"always\",\"when_other_resource"
-"\" eller \"never\""
+"Når skal raden for egne kontakter vises. Kan være \"alltid\", "
+"\"ved_annen_ressurs\" eller \"aldri\""
 
 #: gajim/common/config.py:292
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
+"Alternativ fiksering av jingle-utdataens videoskuddtakt. Eksempelvis: 10/1 "
+"eller 25/2"
 
 #: gajim/common/config.py:293
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr ""
+"Alternativ justering av oppløsning for utdata-video. Eksempelvis: 320x240"
 
 #: gajim/common/config.py:294
 msgid "If True, You will also see your webcam"
-msgstr ""
+msgstr "Hvis sant, vil også du se ditt nettkamera"
 
 #: gajim/common/config.py:297
 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 vil forsøke å bruke STUN-tjener ved bruk av Jingle. Valget er i "
+"\"stun_server\", eller det gitt av XMPP-tjeneren."
 
 #: gajim/common/config.py:298
 msgid "STUN server to use when using Jingle"
-msgstr ""
+msgstr "STUN-tjener til bruk med Jingle"
 
 #: 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 ""
+"Hvis sant vil Gajim vise tilhørighet for deltagere i gruppesamtale ved å "
+"legge til en farget firkant i status-miniatyrbildet"
 
 #: gajim/common/config.py:300
 msgid ""
 "Proxy used for all outgoing connections if the account does not have a "
 "specific proxy configured"
 msgstr ""
+"Mellomtjenere brukt for utgående tilkoblinger, hvis kontoen ikke har satt "
+"opp en spesifikk mellomtjener"
 
 #: gajim/common/config.py:301
 msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
 msgstr ""
+"Hvis sant vil Gajim ignorere innkommende forespørsler om oppmerksomhet "
+"(\"wizz\")."
 
 #: gajim/common/config.py:302
 msgid ""
 "If enabled, Gajim will reopen chat windows that were opened last time Gajim "
 "was closed."
 msgstr ""
+"Hvis påskrudd vil Gajim presentere viduene fra sist gang Gajim ble lukket."
 
 #: gajim/common/config.py:303
-#, fuzzy
 msgid ""
 "If enabled, Gajim will show an icon to show that sent message has been "
 "received by your contact"
 msgstr ""
-"Dersom valgt vil Gajim ikke spør for en status beskjed. Standard valget for "
-"beskjed vil benyttes isteden."
+"Hvis valgt vil Gajim vise et ikon for å gjøre oppmerksom på at sendt melding "
+"har ankommet kontakt"
 
 #: gajim/common/config.py:304
 msgid "Show a mini avatar in chat window tabs and in window icon"
-msgstr ""
+msgstr "Vis en miniavatar i sludrevindusfaner og i vindusikonet"
 
 #: gajim/common/config.py:305
-#, fuzzy
 msgid "If True, Gajim will use the Systems Keyring to store account passwords."
 msgstr ""
-"Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
-"konto passord."
+"Dersom sant vil Gajim bruke Gnome-nøkkelringen (dersom tilgjengelig) til å "
+"lagre kontopassord."
 
 #: gajim/common/config.py:306
 msgid "Sets the encoding used by python-gnupg"
-msgstr ""
+msgstr "Setter kodingen brukt av python-gnupg"
 
 #: gajim/common/config.py:307
 msgid "If True, Gajim will execute XEP-0146 Commands."
-msgstr ""
+msgstr "Kjøring av XEP-0146-kommandoer i Gajim."
 
 #: gajim/common/config.py:323
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
-"Prioritet vil endre automatisk i følge med din status. Prioritetene "
-"defineres i autopriority_* valgene."
+"Prioritet vil endres automatisk i følge med din status. Prioritet bestemmes "
+"i autopriority_*-valgene."
 
 #: gajim/common/config.py:331
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
-"Status som brukes for automatisk tilkobling som. Can være pålogget, samtale, "
-"borte, xa, ikke forstyrr, usynlig. MERK: dette valget brukes bare dersom "
-"restore_last_status er deaktivert"
+"Status man automatisk tilkobles som. Kan være 'pålogget', 'i samtale', "
+"'borte', 'lengre tids fravær', 'ikke forstyrr' eller 'usynlig'. MERK: dette "
+"valget brukes bare dersom restore_last_status er avskrudd"
 
 #: gajim/common/config.py:332
 msgid "If enabled, restore the last status that was used."
-msgstr "Dersom valgt, gjenopprett siste status brukt."
+msgstr "Dersom valgt, gjenopprett sist brukte status."
 
 #: gajim/common/config.py:334
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
-"Dersom True, vil kontakter som ber om godkjenning bli automatisk akseptert."
+"Hvis sant vil kontakter som ber om godkjenning bli akseptert automatisk."
 
 #: gajim/common/config.py:335
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
-"Dersom False vil bildeikoner bli slått av og ikke vises i kontaktliste "
-"vinduet."
+"Dersom usant vil bildeikoner bli slått av og ikke vises i "
+"kontaktlistevinduet."
 
 #: gajim/common/config.py:338
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
-"Dersom deaktivert, ikke signer tilstedeværelser med GPG nøkkel, selv om GPG "
-"er konfigurert."
+"Dersom avskrudd vil ikke tilstedeværelsesatuser bli signert med GPG-nøkkel, "
+"selv om GPG er satt opp."
 
 #: gajim/common/config.py:340
 msgid "Enable ESessions encryption for this account."
-msgstr "Aktiver ESessions kryptering for denne kontoen."
+msgstr "Skru på ESessions-kryptering for denne kontoen."
 
 #: gajim/common/config.py:341
 msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr "Skal Gajim automatisk starte en kryptert sesjon når mulig?"
+msgstr "Skal Gajim automatisk starte ei kryptert økt når det er mulig?"
 
 #: gajim/common/config.py:342
 msgid "Allow plaintext connections"
-msgstr ""
+msgstr "Tillat klarteksttilkoblinger"
 
 #: gajim/common/config.py:345
 msgid ""
@@ -6042,47 +5894,56 @@ msgid ""
 "ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
 "PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
 msgstr ""
+"Mellomromsinndelt liste over godkjennelsesmekanismer å prøve. Kan inneholde "
+"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
+"PLAIN, X-MESSENGER-OAUTH2 eller XEP-0078"
 
 #: gajim/common/config.py:346
-#, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
 "Can be 'warn', 'connect', 'disconnect'"
 msgstr ""
-"Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
+"Vis en advarselsdialog før forsendelse av passord over ukryptert tilkobling. "
+"Kan være 'advar', 'koble til' eller 'koble fra'"
 
 #: 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."
+msgstr "Vis en advarselsdialog før bruk av standard SSL-bibliotek."
 
 #: 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."
+"Vis en advarselsdialog før forsendelse av passord i KLARTEKST over ukryptert "
+"tilkobling."
 
 #: gajim/common/config.py:351
 msgid "Space separated list of ssl errors to ignore."
-msgstr "Mellomromseparert liste av ssl feilmeldinger som ignoreres."
+msgstr "Mellomromsinndelt liste av SSL-feilmeldinger som skal ignoreres."
 
 #: 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 ""
+"Mellomromsinndelt liste over JID-er du ikke ønsker å logge. Du kan også "
+"legge til kontonavn for å ikke logge denne kontoen."
 
 #: gajim/common/config.py:358
 msgid ""
 "On startup, Gajim will download logs stored on server, provided the server "
 "supports XEP-0313"
 msgstr ""
+"Ved oppstart vil Gajim laste ned logger lagret på tjeneren, forbeholdt at "
+"tjeneren støtter XEP-0313"
 
 #: 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 ""
+"Mellomromsinndelt liste over JID-er du godtar å ikke logge samtaler med hvis "
+"vedkommende ikke ønsker det."
 
 #: gajim/common/config.py:362
 msgid "Whitespace sent after inactivity"
@@ -6090,34 +5951,36 @@ msgstr "Mellomrom sendt etter inaktivitet"
 
 #: gajim/common/config.py:363
 msgid "XMPP ping sent after inactivity"
-msgstr "XMPP ping sendt etter inaktivitet"
+msgstr "XMPP-ping sendt etter inaktivitet"
 
 #: 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 ""
-"Hvor mange sekunder skal man vente på svar fra ping alive pakker før vi "
-"prøver å koble til på nytt."
+"Hvor mange sekunder skal det ventes på svar fra livstegns-ping før "
+"gjentilkobling?"
 
 #: gajim/common/config.py:371
 msgid "Jabberd2 workaround"
-msgstr "Jabberd2 omvei"
+msgstr "Jabberd2-omvei"
 
 #: 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 ""
-"Dersom valgt vil Gajim bruke din IP og proxier definert i "
-"file_transfer_proxies valget for filoverføring."
+"Dersom valgt vil Gajim bruke din IP og mellomtjenere bestemt i "
+"file_transfer_proxies-valget for filoverføring."
 
 #: 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 ""
+"Hvis sant, vil Gajim teste filoverførings-mellomtjenere ved oppstart for å "
+"forsikre seg om at de virker. Openfire sine mellomtjenere feiler denne "
+"testen selv om de virker."
 
 #: gajim/common/config.py:388
 msgid "Answer to receipt requests"
@@ -6125,105 +5988,105 @@ msgstr "Svar på kvitteringsforespørsler"
 
 #: gajim/common/config.py:389
 msgid "Sent receipt requests"
-msgstr "Sende kvitteringsforespørsler"
+msgstr "Sendte kvitteringsforespørsler"
 
 #: gajim/common/config.py:398
-#, fuzzy
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
-msgstr ""
-"Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
-"bruker"
+msgstr "Tillat Gajim å sende informasjon om hvilket operativsystem du bruker."
 
 #: gajim/common/config.py:399
-#, fuzzy
 msgid "Allow Gajim to send your local time."
-msgstr "%s ønsker å sende deg en fil."
+msgstr "Tillat Gajim å sende din lokale tid."
 
 #: gajim/common/config.py:400
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
-"Når vi forhandler en kryptert sesjon, skal Gajim anta at du ønsker at "
-"meldinger skal logges?"
+"Når vi fremforhandler ei kryptert økt, skal Gajim anta at du ønsker å "
+"loggføre meldinger?"
 
 #: 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"
+msgstr "Melding sendt til kontakter du ønsker å legge til"
 
 #: 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 ""
+"Hvis påskrudd og tjeneren støtter denne funksjonen, vil Gajim motta "
+"meldinger sendt og mottatt av andre ressurser."
 
 #: 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 ""
+"Hvis påskrudd vil Gajim sende dine lokale IP-er slik at din kontakt kan "
+"koble til din maskin for å overføre filer."
 
 #: gajim/common/config.py:406
-#, fuzzy
 msgid "Latest token for OAuth 2.0 authentication."
-msgstr "Anonym autentisering"
+msgstr "Siste symbol for OAuth 2.0-bekreftelse."
 
 #: gajim/common/config.py:407
-#, fuzzy
 msgid "client_id for OAuth 2.0 authentication."
-msgstr "Anon_ym autentisering"
+msgstr "client_id for OAuth 2.0-bekreftelse."
 
 #: gajim/common/config.py:408
-#, fuzzy
 msgid "redirect_url for OAuth 2.0 authentication."
-msgstr "Anon_ym autentisering"
+msgstr "redirect_url for OAuth 2.0-bekreftelse."
 
 #: 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 ""
+"Mellomromsinndelt liste over JID-er du vil gjenåpne samtalevindu med ved "
+"neste oppstart."
 
 #: gajim/common/config.py:411
 msgid "HTTP Upload: Enable HTTPS Verification"
-msgstr ""
+msgstr "HTTP-opplasting: Skru på HTTPS-bekrefting"
 
 #: gajim/common/config.py:412
 msgid ""
 "Preferred file transfer mechanism for file drag&drop on chat window. Can be "
 "'httpupload' (default) or 'jingle'"
 msgstr ""
+"Foretrukket filoverføringsmekanisme for dra-og-slipp -funksjonalitet i "
+"sludrevinduet. Kan være 'httpupload' (forvalg) eller 'jingle'"
 
 #: 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"
+msgstr "Språk brukt til å sjekke feilstavede ord"
 
 #: gajim/common/config.py:477
 msgid "The currently active encryption for that contact"
-msgstr ""
+msgstr "Nåværende aktiv kryptering for nevnte kontakt"
 
 #: 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 ""
-"Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale."
+"Hvor mange linjer skal etterspørres når man går inn i en gruppesamtale. -1 "
+"betyr ingen grense, -2 betyr global verdi"
 
 #: 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 ""
-"Hvor mange minutter med logg skal man be om når man går inn i en "
-"gruppesamtale. "
+"Hvor mange minutter med logg som skal forespørres ved inntreden i "
+"gruppesludring. -1 betyr ingen grense, -2 betyr global verdi"
 
 #: gajim/common/config.py:483
 msgid "State whether we want a notification for every message in this room"
 msgstr ""
+"Hvorvidt det er ønskelig med en merknad for hver melding i dette rommet"
 
 #: gajim/common/config.py:486
 msgid ""
@@ -6231,6 +6094,9 @@ msgid ""
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
+"Bestem hvorvidt tillegg skal skrus på ved oppstart (dette lagres når Gajim "
+"skrus av). Dette valget SKAL IKKE brukes til å (de)aktivere tillegg. Bruk "
+"GUI i steden for."
 
 #: gajim/common/config.py:491 gajim/common/pep.py:157
 msgid "Sleeping"
@@ -6238,7 +6104,7 @@ msgstr "Sover"
 
 #: gajim/common/config.py:492
 msgid "Back soon"
-msgstr "Snart tilbake"
+msgstr "Straks tilbake"
 
 #: gajim/common/config.py:492
 msgid "Back in some minutes."
@@ -6250,7 +6116,7 @@ msgstr "Spiser"
 
 #: gajim/common/config.py:493
 msgid "I'm eating, so leave me a message."
-msgstr "Jeg spiser, så legg igjen en beskjed"
+msgstr "Jeg spiser, legg igjen en beskjed."
 
 #: gajim/common/config.py:494
 msgid "Movie"
@@ -6258,7 +6124,7 @@ msgstr "Film"
 
 #: gajim/common/config.py:494
 msgid "I'm watching a movie."
-msgstr "Jeg ser på en film."
+msgstr "Ser på en film."
 
 #: gajim/common/config.py:495 gajim/common/pep.py:186
 msgid "Working"
@@ -6274,7 +6140,7 @@ msgstr "Telefon"
 
 #: gajim/common/config.py:496
 msgid "I'm on the phone."
-msgstr "Jeg sitter i telefonen."
+msgstr "Sitter i telefonen."
 
 #: gajim/common/config.py:497
 msgid "Out"
@@ -6282,7 +6148,7 @@ msgstr "Ute"
 
 #: gajim/common/config.py:497
 msgid "I'm out enjoying life."
-msgstr "Jeg er ute og lever livet."
+msgstr "Ute og lever livet."
 
 #: gajim/common/config.py:508
 msgid "I'm available."
@@ -6302,26 +6168,26 @@ msgstr "Ikke forstyrr."
 
 #: gajim/common/config.py:513 gajim/common/config.py:514
 msgid "Bye!"
-msgstr "Hade bra!"
+msgstr "Adjø!"
 
 #: 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 ""
-"Lyd som spilles når en samtalerom melding inneholder et av ordene i "
-"muc_highlight_words, eller når en samtalerom melding inneholder ditt "
-"kallenavn."
+"Lyd som spilles når en melding i et samtalerom inneholder et av ordene i "
+"muc_highlight_words, eller når en melding i et samtalerom inneholder "
+"kallenavnet ditt."
 
 #: 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."
+msgstr "Lyd som spilles når en MUC-melding ankommer."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "grønn"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "varehandel"
 
@@ -6331,12 +6197,11 @@ msgstr "menneskelig"
 
 #: gajim/common/config.py:546
 msgid "marine"
-msgstr "marine"
+msgstr "maritimt"
 
 #: gajim/common/config.py:553
-#, fuzzy
 msgid "Tor"
-msgstr "Til"
+msgstr "Tor"
 
 #: gajim/common/commands.py:86
 msgid "Change status information"
@@ -6348,7 +6213,7 @@ msgstr "Endre status"
 
 #: gajim/common/commands.py:109
 msgid "Set the presence type and description"
-msgstr "Sett fraværstype og beskrivelse"
+msgstr "Sett tilstedeværelses-type og beskrivelse"
 
 #: gajim/common/commands.py:115
 msgid "Free for chat"
@@ -6356,11 +6221,11 @@ msgstr "Ledig for samtale"
 
 #: gajim/common/commands.py:116
 msgid "Online"
-msgstr "Tilkoblet"
+msgstr "PÃ¥logget"
 
 #: gajim/common/commands.py:118
 msgid "Extended away"
-msgstr "Utvidet borte"
+msgstr "Utvidet fravær"
 
 #: gajim/common/commands.py:119
 msgid "Do not disturb"
@@ -6368,11 +6233,11 @@ msgstr "Ikke forstyrr"
 
 #: gajim/common/commands.py:120
 msgid "Offline - disconnect"
-msgstr "Frakoblet - ikke kontakt"
+msgstr "Frakoblet - koblet fra"
 
 #: gajim/common/commands.py:125
 msgid "Presence description:"
-msgstr "Tilstedeværelses beskrivelse:"
+msgstr "Tilstedeværelsesbeskrivelse:"
 
 #: gajim/common/commands.py:160 gajim/common/commands.py:343
 msgid "The status has been changed."
@@ -6380,7 +6245,7 @@ msgstr "Statusen har blitt endret."
 
 #: gajim/common/commands.py:192 gajim/common/commands.py:225
 msgid "Leave Groupchats"
-msgstr "GÃ¥ ut av Gruppesamtale"
+msgstr "Forlat gruppesamtaler"
 
 #: gajim/common/commands.py:215
 #, python-format
@@ -6389,7 +6254,7 @@ msgstr "%(nickname)s fra %(room_jid)s"
 
 #: gajim/common/commands.py:219
 msgid "You have not joined a groupchat."
-msgstr "Du har ikke blitt med i en gruppesamtale."
+msgstr "Du har ikke tatt del i en gruppesamtale."
 
 #: gajim/common/commands.py:226
 msgid "Choose the groupchats you want to leave"
@@ -6405,39 +6270,37 @@ msgstr "Videresend uleste meldinger"
 
 #: gajim/common/commands.py:310
 msgid "All unread messages have been forwarded."
-msgstr "Alle uleste meldinger har blitt videresendt."
+msgstr "Samtlige uleste meldinger har blitt videresendt."
 
 #: gajim/common/commands.py:318
-#, fuzzy
 msgid "Forward unread message then disconnect"
-msgstr "Videresend uleste meldinger"
+msgstr "Videresend uleste meldinger for så å koble fra"
 
 #: gajim/common/httpupload.py:137
 msgid "File is empty"
-msgstr "Filen er tom"
+msgstr "Fila er tom"
 
 #: gajim/common/httpupload.py:140
 msgid "File does not exist"
-msgstr "Filen finnes ikke"
+msgstr "Fila 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 ""
+msgstr "Filen er for stor, maksimal tillatt filstørrelse er: %s"
 
 #: gajim/common/check_paths.py:37
 msgid "creating logs database"
-msgstr "lager logg database"
+msgstr "Oppretter logg-database"
 
 #: gajim/common/check_paths.py:98
-#, fuzzy
 msgid "creating cache database"
-msgstr "lager logg database"
+msgstr "oppretter mellomlager for logg-database"
 
 #: gajim/common/check_paths.py:261
-#, fuzzy, python-format
+#, python-format
 msgid "moving %(src)s to %(dst)s"
-msgstr "Send %s til %s"
+msgstr "flytter %(src)s til %(dst)s"
 
 #: gajim/common/check_paths.py:287 gajim/common/check_paths.py:294
 #: gajim/common/check_paths.py:301 gajim/common/check_paths.py:308
@@ -6445,7 +6308,7 @@ msgstr "Send %s til %s"
 #: 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"
+msgstr "%s er ei fil men skulle ha vært en katalog"
 
 #: gajim/common/check_paths.py:288 gajim/common/check_paths.py:295
 #: gajim/common/check_paths.py:302 gajim/common/check_paths.py:309
@@ -6458,20 +6321,20 @@ msgstr "Gajim vill nå lukkes"
 #: 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"
+msgstr "%s er en katalog men skulle vært ei fil"
 
 #: gajim/common/optparser.py:55
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "turkis"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
-msgstr "migrerer logg databaser til indekser"
+msgstr "migrerer loggdatabaser til indekser"
 
 #: gajim/common/logging_helpers.py:34
 #, python-format
@@ -6480,7 +6343,7 @@ msgstr "%s er ikke et gyldig loggnivå"
 
 #: gajim/common/connection.py:79
 msgid "Unable to get issuer certificate"
-msgstr "Ikke i stand til å få utsteders sertifikat"
+msgstr "Ikke i stand til innhente utsteders sertifikat"
 
 #: gajim/common/connection.py:80
 msgid "Unable to get certificate CRL"
@@ -6492,7 +6355,7 @@ msgstr "Ikke i stand til å dekryptere sertifikatets signatur"
 
 #: gajim/common/connection.py:82
 msgid "Unable to decrypt CRL's signature"
-msgstr "Ikke i stand til å dekryptere CRLens signatur"
+msgstr "Ikke i stand til å dekryptere CRL-ens signatur"
 
 #: gajim/common/connection.py:83
 msgid "Unable to decode issuer public key"
@@ -6500,11 +6363,11 @@ msgstr "Klarer ikke å dekode usteders offentlige nøkkel"
 
 #: gajim/common/connection.py:84
 msgid "Certificate signature failure"
-msgstr "Sertifikat signatur feil"
+msgstr "Sertifikat-signaturfeil"
 
 #: gajim/common/connection.py:85
 msgid "CRL signature failure"
-msgstr "CRL signatur feil"
+msgstr "CRL-signaturfeil"
 
 #: gajim/common/connection.py:86
 msgid "Certificate is not yet valid"
@@ -6524,19 +6387,19 @@ msgstr "CRL har utgått"
 
 #: gajim/common/connection.py:90
 msgid "Format error in certificate's notBefore field"
-msgstr "Formaterings feil i sertifkatets notBefore felt"
+msgstr "Formateringsfeil i sertifkatets ikkeFør-felt"
 
 #: gajim/common/connection.py:91
 msgid "Format error in certificate's notAfter field"
-msgstr "Formaterings feil i sertifikatets notAfter felt"
+msgstr "Formateringsfeil i sertifikatets ikkeEtter-felt"
 
 #: gajim/common/connection.py:92
 msgid "Format error in CRL's lastUpdate field"
-msgstr "Formaterings feil i CRLens lastUpdate felt"
+msgstr "Formateringsfeil i CRL-ens sisteOppdatering-s-felt"
 
 #: gajim/common/connection.py:93
 msgid "Format error in CRL's nextUpdate field"
-msgstr "Formaterings feil i CRLens nextUpdate felt"
+msgstr "Formateringsfeil i CRL-ens nesteOppdatering-s-felt"
 
 #: gajim/common/connection.py:94
 msgid "Out of memory"
@@ -6548,7 +6411,7 @@ msgstr "Selvsignert sertifikat"
 
 #: gajim/common/connection.py:96
 msgid "Self signed certificate in certificate chain"
-msgstr "Selvsignert sertifikat i sertifikats kjeden"
+msgstr "Selvsignert sertifikat i sertifikatkjeden"
 
 #: gajim/common/connection.py:97
 msgid "Unable to get local issuer certificate"
@@ -6556,11 +6419,11 @@ msgstr "Ute av stand til å få tak i lokal utsteders sertifikat"
 
 #: gajim/common/connection.py:98
 msgid "Unable to verify the first certificate"
-msgstr "Ute av stand til å verifisere det første sertifikatet"
+msgstr "Ute av stand til å bekrefte det første sertifikatet"
 
 #: gajim/common/connection.py:99
 msgid "Certificate chain too long"
-msgstr "Sertifikats kjeden er for lang"
+msgstr "Sertifikatskjeden er for lang"
 
 #: gajim/common/connection.py:100
 msgid "Certificate revoked"
@@ -6568,15 +6431,15 @@ msgstr "Sertifikat tilbakekallt"
 
 #: gajim/common/connection.py:101
 msgid "Invalid CA certificate"
-msgstr "Ugyldig CA sertifikat"
+msgstr "Ugyldig CA-sertifikat"
 
 #: gajim/common/connection.py:102
 msgid "Path length constraint exceeded"
-msgstr "Stilengde begrensning overskredet"
+msgstr "Stilengde-begrensning overskredet"
 
 #: gajim/common/connection.py:103
 msgid "Unsupported certificate purpose"
-msgstr "Ikke støttet sertifkats hensikt"
+msgstr "Ikke støttet sertifkats-hensikt"
 
 #: gajim/common/connection.py:104
 msgid "Certificate not trusted"
@@ -6584,65 +6447,65 @@ msgstr "Sertifikatet er ikke tiltrodd"
 
 #: gajim/common/connection.py:105
 msgid "Certificate rejected"
-msgstr "Sertifikatet avvist"
+msgstr "Sertifikat avvist"
 
 #: gajim/common/connection.py:106
 msgid "Subject issuer mismatch"
-msgstr "Tittel utsteder passer ikke"
+msgstr "Emne-utsteder samsvarer ikke"
 
 #: gajim/common/connection.py:107
 msgid "Authority and subject key identifier mismatch"
-msgstr "Autoritet og tittel nøkkel identifikator passer ikke"
+msgstr "Autoritet og emne-nøkkel-identifikator samsvarer ikke"
 
 #: gajim/common/connection.py:108
 msgid "Authority and issuer serial number mismatch"
-msgstr "Autoritet og utsteder seriernummer passer ikke"
+msgstr "Autoritet og utsteders seriernummer samsvarer ikke"
 
 #: gajim/common/connection.py:109
 msgid "Key usage does not include certificate signing"
-msgstr "Nøkkel bruk inkluderer ikke sertifikats signering"
+msgstr "Nøkkelbruk inkluderer ikke sertifikatssignering"
 
 #: gajim/common/connection.py:110
 msgid "Application verification failure"
-msgstr "Applikasjons verifiserings feil"
+msgstr "Programbekreftelsesfeil"
 
 #: gajim/common/connection.py:870
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
-msgstr "Tilkobling til konto \"%s\" har blitt mistet"
+msgstr "Tilkobling til konto \"%s\" gikk tapt"
 
 #: gajim/common/connection.py:871
 msgid "Reconnect manually."
-msgstr "Automatisk tilkobling."
+msgstr "Koble til igjen manuelt."
 
 #: 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"
+msgstr "Tjeneren %(name)s svarte feil på registreringsforespørselen: %(error)s"
 
 #: gajim/common/connection.py:923
 #, python-format
 msgid "Server %s provided a different registration form"
-msgstr "Server %s tilbyr et annet registrerings skjema"
+msgstr "Tjeneren %s oppga et annet registreringsskjema"
 
 #: gajim/common/connection.py:1277
-#, fuzzy, python-format
+#, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
-msgstr "Kunne ikke koble til \"%s\""
+msgstr "Kunne ikke koble til \"%(host)s\" via mellomtjeneren \"%(proxy)s\""
 
 #: gajim/common/connection.py:1280
-#, fuzzy, python-format
+#, python-format
 msgid "Could not connect to \"%(host)s\""
-msgstr "Kunne ikke koble til \"%s\""
+msgstr "Kunne ikke koble til \"%(host)s\""
 
 #: gajim/common/connection.py:1287
 #, python-format
 msgid "Server replied: %s"
-msgstr "Servern svarte: %s"
+msgstr "Tjeneren svarte: %s"
 
 #: gajim/common/connection.py:1302
 msgid "Connection to proxy failed"
-msgstr "Tilkobling til proxy feilet"
+msgstr "Tilkobling til mellomtjener feilet"
 
 #: gajim/common/connection.py:1340 gajim/common/connection.py:1443
 #, python-format
@@ -6652,12 +6515,12 @@ msgstr "Kunne ikke koble til kontoen %s"
 #: 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."
+msgstr "Tilkobling til konto %s gikk tapt. Prøv å koble til igjen."
 
 #: gajim/common/connection.py:1366
-#, fuzzy, python-format
+#, python-format
 msgid "The authenticity of the %s certificate could be invalid"
-msgstr "Påliteligheten til sertifikatet %s kan være ugyldig."
+msgstr "Gyldigheten til %s-sertifikatet kan være ugyldig"
 
 #: gajim/common/connection.py:1369
 #, python-format
@@ -6666,7 +6529,7 @@ msgid ""
 "SSL Error: <b>%s</b>"
 msgstr ""
 "\n"
-"SSL Feil: <b>%s</b>"
+"SSL-feil: <b>%s</b>"
 
 #: gajim/common/connection.py:1371
 #, python-format
@@ -6675,14 +6538,16 @@ msgid ""
 "Unknown SSL error: %d"
 msgstr ""
 "\n"
-"Ukjent SSL feil: %d"
+"Ukjent SSL-feil: %d"
 
 #: gajim/common/connection.py:1417
-#, fuzzy, python-format
+#, 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."
+msgstr ""
+"Påliteligheten til sertifikatet %s kan være ugyldig.\n"
+"Sertifikatet dekker ikke dette domenet."
 
 #: gajim/common/connection.py:1467 gajim/common/connection.py:2235
 #: gajim/common/zeroconf/connection_zeroconf.py:209
@@ -6693,101 +6558,100 @@ msgstr "Kunne ikke koble til \"%s\""
 #: gajim/common/connection.py:1506
 #, python-format
 msgid "Authentication failed with \"%s\""
-msgstr "Autentisering feilet med \"%s\""
+msgstr "Identitetsbekreftelse feilet med følgende, \"%s\""
 
 #: gajim/common/connection.py:1507
 msgid "Please check your login and password for correctness."
-msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
+msgstr "Sjekk at brukernavn og passord er korrekt."
 
 #: gajim/common/connection.py:2094
-#, fuzzy, python-format
+#, python-format
 msgid "Sent contact: \"%(jid)s\" (%(name)s)"
-msgstr "Sendt kontakt: \"%s\" (%s)"
+msgstr "Sendt kontakt: \"%(jid)s\" (%(name)s)"
 
 #: gajim/common/connection.py:2098
 msgid "Sent contacts:"
-msgstr "Sendt kontakter:"
+msgstr "Sendte kontakter:"
 
 #: 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"
+msgstr "Ikke innhentet på grunn av usynlig status"
 
 #: gajim/common/dbus_support.py:44
 msgid "D-Bus python bindings are missing in this computer"
-msgstr "D-Bus python bindinger mangler på denne maskinen"
+msgstr "D-Bus-pythonbindinger mangler på denne maskinen"
 
 #: gajim/common/dbus_support.py:45 gajim/common/dbus_support.py:56
 msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
+msgstr "D-Bus-egenskapene til Gajim kan ikke brukes"
 
 #: gajim/common/dbus_support.py:55
 msgid "D-Bus does not run correctly on this machine"
-msgstr "D-Bus fungerer ikke riktig på denne maskinen"
+msgstr "D-Bus fungerer ikke ordentlig på denne maskinen"
 
 #: gajim/common/dbus_support.py:58
-#, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
-msgstr "D-Bus fungerer ikke riktig på denne maskinen"
+msgstr ""
+"D-Bus fungerer ikke ordentlig på denne maskinen: systembussen er ikke "
+"tilstede"
 
 #: gajim/common/dbus_support.py:61
-#, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
-msgstr "D-Bus fungerer ikke riktig på denne maskinen"
+msgstr ""
+"D-Bus fungerer ikke ordentlig på denne maskinen: økt-bussen er ikke tilstede"
 
 #: gajim/common/multimedia_helpers.py:40
-#, fuzzy
 msgid "Default device"
-msgstr "Standard Melding"
+msgstr "Forvalgt enhet"
 
 #: gajim/common/multimedia_helpers.py:59
 msgid "Audio test"
-msgstr ""
+msgstr "Lydtest"
 
 #: gajim/common/multimedia_helpers.py:62 gajim/common/multimedia_helpers.py:78
 #: gajim/common/multimedia_helpers.py:92 gajim/common/multimedia_helpers.py:110
 msgid "Autodetect"
-msgstr ""
+msgstr "Automatisk oppdaging"
 
 #: gajim/common/multimedia_helpers.py:65 gajim/common/multimedia_helpers.py:80
-#, fuzzy, python-format
+#, python-format
 msgid "ALSA: %s"
-msgstr "Størrelse: %s"
+msgstr "ALSA: %s"
 
 #: gajim/common/multimedia_helpers.py:68 gajim/common/multimedia_helpers.py:82
-#, fuzzy, python-format
+#, python-format
 msgid "Pulse: %s"
-msgstr "Fil: %s"
+msgstr "Pulse: %s"
 
 #: gajim/common/multimedia_helpers.py:76
 msgid "Fake audio output"
-msgstr ""
+msgstr "Falsk lydutdata"
 
 #: gajim/common/multimedia_helpers.py:89
 msgid "Video test"
-msgstr ""
+msgstr "Videotest"
 
 #: gajim/common/multimedia_helpers.py:94
 #, python-format
 msgid "V4L2: %s"
-msgstr ""
+msgstr "V4L2: %s"
 
 #: gajim/common/multimedia_helpers.py:97
-#, fuzzy
 msgid "Screen"
-msgstr "grønn"
+msgstr "Skjerm"
 
 #: gajim/common/multimedia_helpers.py:104
 msgid "Fake video output"
-msgstr ""
+msgstr "Falsk videoutdata"
 
 #: gajim/common/multimedia_helpers.py:107
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
-msgstr ""
+msgstr "X-vindusystem (X11/XShm/Xv): %s"
 
 #: gajim/common/multimedia_helpers.py:109
 msgid "X Window System (without Xv)"
-msgstr ""
+msgstr "X-vindusystem (uten Xv)"
 
 #: gajim/common/pep.py:27
 msgid "Afraid"
@@ -6803,7 +6667,7 @@ msgstr "Amorøs"
 
 #: gajim/common/pep.py:30
 msgid "Angry"
-msgstr "Sint"
+msgstr "Er Bjørn Sundquist"
 
 #: gajim/common/pep.py:31
 msgid "Annoyed"
@@ -6967,7 +6831,7 @@ msgstr "Imponert"
 
 #: gajim/common/pep.py:71
 msgid "In Awe"
-msgstr "I Respekt"
+msgstr "Ærefrykt"
 
 #: gajim/common/pep.py:72
 msgid "In Love"
@@ -7127,11 +6991,11 @@ msgstr "Bekymret"
 
 #: gajim/common/pep.py:113
 msgid "Doing Chores"
-msgstr "Gjør Oppgaver"
+msgstr "Utfører gjøremål"
 
 #: gajim/common/pep.py:114
 msgid "Buying Groceries"
-msgstr "Kjøper Grønnsaker"
+msgstr "Kjøper mat"
 
 #: gajim/common/pep.py:115
 msgid "Cleaning"
@@ -7139,31 +7003,31 @@ msgstr "Vasker"
 
 #: gajim/common/pep.py:116
 msgid "Cooking"
-msgstr "Koker"
+msgstr "Lager mat"
 
 #: gajim/common/pep.py:117
 msgid "Doing Maintenance"
-msgstr "Gjør Vedlikehold"
+msgstr "Driver vedlikehold"
 
 #: gajim/common/pep.py:118
 msgid "Doing the Dishes"
-msgstr "Tar Oppvasken"
+msgstr "Tar oppvasken"
 
 #: gajim/common/pep.py:119
 msgid "Doing the Laundry"
-msgstr "Vasker Skittentøy"
+msgstr "Vasker klær"
 
 #: gajim/common/pep.py:120
 msgid "Gardening"
-msgstr "Gjør Hagearbeid"
+msgstr "Gjør hagearbeid"
 
 #: gajim/common/pep.py:121
 msgid "Running an Errand"
-msgstr "Løper et Ærend"
+msgstr "Løper et ærend"
 
 #: gajim/common/pep.py:122
 msgid "Walking the Dog"
-msgstr "GÃ¥r tur med Hunden"
+msgstr "GÃ¥r tur med hunden"
 
 #: gajim/common/pep.py:123
 msgid "Drinking"
@@ -7171,35 +7035,35 @@ msgstr "Drikker"
 
 #: gajim/common/pep.py:124
 msgid "Having a Beer"
-msgstr "Tar seg en Øl"
+msgstr "Tar seg en øl"
 
 #: gajim/common/pep.py:125
 msgid "Having Coffee"
-msgstr "Tar seg en Kaffe"
+msgstr "Tar seg en kaffe"
 
 #: gajim/common/pep.py:126
 msgid "Having Tea"
-msgstr "Tar seg en Kopp Te"
+msgstr "Tar seg en kopp té"
 
 #: gajim/common/pep.py:128
 msgid "Having a Snack"
-msgstr "Tar seg en Matbit"
+msgstr "Tar seg en matbit"
 
 #: gajim/common/pep.py:129
 msgid "Having Breakfast"
-msgstr "Spiser Frokost"
+msgstr "Spiser frokost"
 
 #: gajim/common/pep.py:130
 msgid "Having Dinner"
-msgstr "Spiser Middag"
+msgstr "Spiser middag"
 
 #: gajim/common/pep.py:131
 msgid "Having Lunch"
-msgstr "Spiser Lunch"
+msgstr "Spiser lunsj"
 
 #: gajim/common/pep.py:132
 msgid "Exercising"
-msgstr "Trener"
+msgstr "Trimmer"
 
 #: gajim/common/pep.py:133 gajim/common/pep.py:178
 msgid "Cycling"
@@ -7219,7 +7083,7 @@ msgstr "Jogger"
 
 #: gajim/common/pep.py:137
 msgid "Playing Sports"
-msgstr "Spiller Sport"
+msgstr "Bedriver sport"
 
 #: gajim/common/pep.py:138
 msgid "Running"
@@ -7227,7 +7091,7 @@ msgstr "Løper"
 
 #: gajim/common/pep.py:139
 msgid "Skiing"
-msgstr "Går på Ski"
+msgstr "Går på ski"
 
 #: gajim/common/pep.py:140
 msgid "Swimming"
@@ -7243,15 +7107,15 @@ msgstr "Steller seg"
 
 #: gajim/common/pep.py:143
 msgid "At the Spa"
-msgstr "Er på Spa"
+msgstr "Er på spa"
 
 #: gajim/common/pep.py:144
 msgid "Brushing Teeth"
-msgstr "Pusser Tenner"
+msgstr "Pusser tenner"
 
 #: gajim/common/pep.py:145
 msgid "Getting a Haircut"
-msgstr "FÃ¥r seg en HÃ¥rklipp"
+msgstr "Klipper håret"
 
 #: gajim/common/pep.py:146
 msgid "Shaving"
@@ -7259,15 +7123,15 @@ msgstr "Barberer seg"
 
 #: gajim/common/pep.py:147
 msgid "Taking a Bath"
-msgstr "Tar et Bad"
+msgstr "Tar et bad"
 
 #: gajim/common/pep.py:148
 msgid "Taking a Shower"
-msgstr "Tar seg en Dusj"
+msgstr "Tar seg en dusj"
 
 #: gajim/common/pep.py:149
 msgid "Having an Appointment"
-msgstr "Har en Avtale"
+msgstr "Har en avtale"
 
 #: gajim/common/pep.py:150 gajim/data/gui/gajim_themes_window.ui:363
 msgid "Inactive"
@@ -7287,7 +7151,7 @@ msgstr "Gjemmer seg"
 
 #: gajim/common/pep.py:154
 msgid "On Vacation"
-msgstr "PÃ¥ Ferie"
+msgstr "PÃ¥ ferie"
 
 #: gajim/common/pep.py:155
 msgid "Praying"
@@ -7295,7 +7159,7 @@ msgstr "Ber"
 
 #: gajim/common/pep.py:156
 msgid "Scheduled Holiday"
-msgstr "Planlagt Ferie"
+msgstr "Planlagt ferie"
 
 #: gajim/common/pep.py:158
 msgid "Thinking"
@@ -7303,7 +7167,7 @@ msgstr "Tenker"
 
 #: gajim/common/pep.py:159
 msgid "Relaxing"
-msgstr "Slapper Av"
+msgstr "Slapper av"
 
 #: gajim/common/pep.py:160
 msgid "Fishing"
@@ -7351,7 +7215,7 @@ msgstr "Ser på TV"
 
 #: gajim/common/pep.py:171
 msgid "Watching a Movie"
-msgstr "Ser på en Film"
+msgstr "Ser på film"
 
 #: gajim/common/pep.py:172
 msgid "Talking"
@@ -7359,15 +7223,15 @@ msgstr "Snakker"
 
 #: gajim/common/pep.py:173
 msgid "In Real Life"
-msgstr "I det Virkelige Liv"
+msgstr "I det virkelige liv"
 
 #: gajim/common/pep.py:174
 msgid "On the Phone"
-msgstr "Sitter i Telefonen"
+msgstr "Sitter i telefonen"
 
 #: gajim/common/pep.py:175
 msgid "On Video Phone"
-msgstr "PÃ¥ Video Telefon"
+msgstr "PÃ¥ videotelefon"
 
 #: gajim/common/pep.py:176
 msgid "Traveling"
@@ -7383,23 +7247,23 @@ msgstr "Kjører"
 
 #: gajim/common/pep.py:180
 msgid "In a Car"
-msgstr "I en Bil"
+msgstr "I en bil"
 
 #: gajim/common/pep.py:181
 msgid "On a Bus"
-msgstr "PÃ¥ en Buss"
+msgstr "PÃ¥ bussen"
 
 #: gajim/common/pep.py:182
 msgid "On a Plane"
-msgstr "PÃ¥ et Fly"
+msgstr "Flyr"
 
 #: gajim/common/pep.py:183
 msgid "On a Train"
-msgstr "PÃ¥ et Tog"
+msgstr "PÃ¥ toget"
 
 #: gajim/common/pep.py:184
 msgid "On a Trip"
-msgstr "PÃ¥ en Reise"
+msgstr "PÃ¥ reise"
 
 #: gajim/common/pep.py:185
 msgid "Walking"
@@ -7411,7 +7275,7 @@ msgstr "Koder"
 
 #: gajim/common/pep.py:188
 msgid "In a Meeting"
-msgstr "I et Møte"
+msgstr "I et møte"
 
 #: gajim/common/pep.py:189
 msgid "Studying"
@@ -7423,75 +7287,67 @@ msgstr "Skriver"
 
 #: gajim/common/pep.py:195
 msgid "accuracy"
-msgstr ""
+msgstr "nøyaktighet"
 
 #: gajim/common/pep.py:196
-#, fuzzy
 msgid "alt"
-msgstr "standard"
+msgstr "alt"
 
 #: gajim/common/pep.py:197
 msgid "area"
-msgstr ""
+msgstr "område"
 
 #: gajim/common/pep.py:198
-#, fuzzy
 msgid "bearing"
-msgstr "marine"
+msgstr "kurs"
 
 #: gajim/common/pep.py:199
-#, fuzzy
 msgid "building"
-msgstr "Gjemmer seg"
+msgstr "bygning"
 
 #: gajim/common/pep.py:200
-#, fuzzy
 msgid "country"
-msgstr "Land:"
+msgstr "land"
 
 #: gajim/common/pep.py:201
-#, fuzzy
 msgid "countrycode"
-msgstr "Konto"
+msgstr "landskode"
 
 #: gajim/common/pep.py:202
 msgid "datum"
-msgstr ""
+msgstr "dato"
 
 #: gajim/common/pep.py:203
-#, fuzzy
 msgid "description"
 msgstr "Beskrivelse"
 
 #: gajim/common/pep.py:204
-#, fuzzy
 msgid "error"
-msgstr "Feil"
+msgstr "feil"
 
 #: gajim/common/pep.py:205
 msgid "floor"
-msgstr ""
+msgstr "etasje"
 
 #: gajim/common/pep.py:206
 msgid "lat"
-msgstr ""
+msgstr "breddegrad"
 
 #: gajim/common/pep.py:207
 msgid "locality"
-msgstr ""
+msgstr "samhold"
 
 #: gajim/common/pep.py:208
-#, fuzzy
 msgid "lon"
-msgstr "en"
+msgstr "lengdegrad"
 
 #: gajim/common/pep.py:209
 msgid "postalcode"
-msgstr ""
+msgstr "postnummer"
 
 #: gajim/common/pep.py:210
 msgid "region"
-msgstr ""
+msgstr "fylke"
 
 #: gajim/common/pep.py:211
 msgid "room"
@@ -7499,35 +7355,35 @@ msgstr "rom"
 
 #: gajim/common/pep.py:212
 msgid "speed"
-msgstr ""
+msgstr "hastighet"
 
 #: gajim/common/pep.py:213
 msgid "street"
-msgstr ""
+msgstr "gate"
 
 #: gajim/common/pep.py:214
 msgid "text"
-msgstr ""
+msgstr "tekst"
 
 #: gajim/common/pep.py:215
 msgid "timestamp"
-msgstr ""
+msgstr "tidsstempel"
 
 #: gajim/common/pep.py:216
 msgid "uri"
-msgstr "uri"
+msgstr "URI"
 
 #: gajim/common/pep.py:343
 msgid "Unknown Artist"
-msgstr "Ukjent Artist"
+msgstr "Ukjent artist"
 
 #: gajim/common/pep.py:346
 msgid "Unknown Title"
-msgstr "Ukjent Tittel"
+msgstr "Ukjent tittel"
 
 #: gajim/common/pep.py:349
 msgid "Unknown Source"
-msgstr "Ukjent Kilde"
+msgstr "Ukjent kilde"
 
 #: gajim/common/pep.py:352
 #, python-format
@@ -7536,20 +7392,20 @@ msgid ""
 "from <i>%(source)s</i>"
 msgstr ""
 "<b>\"%(title)s\"</b> etter <i>%(artist)s</i>\n"
-"fra  <i>%(source)s</i>"
+"fra <i>%(source)s</i>"
 
 #: gajim/common/stanza_session.py:422
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
-"[Dette er en del av en kryptert sesjon. Dersom du ser denne meldingen gikk "
-"noe galt.]"
+"[Dette er en del av ei kryptert økt. Dersom du ser denne meldingen gikk noe "
+"galt.]"
 
 #: gajim/common/jingle_rtp.py:123
-#, fuzzy, python-format
+#, python-format
 msgid "%s configuration error"
-msgstr "Rom Instillinger"
+msgstr "%s oppsettsfeil"
 
 #: gajim/common/jingle_rtp.py:124
 #, python-format
@@ -7562,50 +7418,57 @@ msgid ""
 "Error was:\n"
 "%(error)s"
 msgstr ""
+"Kunne ikke sette opp %(text)s. Sjekk oppsettet ditt.\n"
+"\n"
+"Kommandokøen var:\n"
+"%(pipeline)s\n"
+"\n"
+"Feilen var:\n"
+"%(error)s"
 
 #: gajim/common/jingle_rtp.py:371
 msgid "audio input"
-msgstr ""
+msgstr "lydinndata"
 
 #: gajim/common/jingle_rtp.py:375
 msgid "audio output"
-msgstr ""
+msgstr "lydutdata"
 
 #: gajim/common/jingle_rtp.py:433
 msgid "video input"
-msgstr ""
+msgstr "videoinndata"
 
 #: gajim/common/jingle_rtp.py:440
 msgid "video output"
-msgstr ""
+msgstr "videoutdata"
 
 #: gajim/common/helpers.py:296
 msgid "Server must be between 1 and 1023 bytes"
-msgstr ""
+msgstr "Tjeneren må være mellom 1 og 1023 byte"
 
 #: gajim/common/helpers.py:304
 msgid "Invalid character in hostname."
-msgstr "Ugyldig karakter i domene navn."
+msgstr "Ugyldig tegn i vertsnavn."
 
 #: gajim/common/helpers.py:306
 msgid "Server address required."
-msgstr "Server adresse kreves."
+msgstr "Tjener-adresse kreves."
 
 #: gajim/common/helpers.py:310
 msgid "Username must be between 1 and 1023 bytes"
-msgstr ""
+msgstr "Brukernavnet må være mellom 1 og 1023 byte"
 
 #: gajim/common/helpers.py:318
 msgid "Invalid character in username."
-msgstr "Ugyldig karakter i brukernavn."
+msgstr "Ugyldig tegn i brukernavn."
 
 #: gajim/common/helpers.py:324
 msgid "Resource must be between 1 and 1023 bytes"
-msgstr ""
+msgstr "Ressursen må være mellom 1 og 1023 byte"
 
 #: gajim/common/helpers.py:332
 msgid "Invalid character in resource."
-msgstr "Ugyldig karakter i ressurs."
+msgstr "Ugyldig tegn i ressurs."
 
 #: gajim/common/helpers.py:372
 msgid "_Busy"
@@ -7613,16 +7476,15 @@ msgstr "_Opptatt"
 
 #: gajim/common/helpers.py:377
 msgid "_Not Available"
-msgstr "_Ikke Tilgjengelig"
+msgstr "_Ikke tilgjengelig"
 
 #: gajim/common/helpers.py:382
 msgid "_Free for Chat"
-msgstr "_Ledig for Samtale"
+msgstr "_Ledig for prat"
 
 #: gajim/common/helpers.py:387
-#, fuzzy
 msgid "?user status:_Available"
-msgstr "?transfer status:Pauset"
+msgstr "?user status:_Tilgjengelig"
 
 #: gajim/common/helpers.py:391
 msgid "Connecting"
@@ -7646,7 +7508,7 @@ msgstr "?contact has status:Ukjent"
 
 #: gajim/common/helpers.py:412
 msgid "?contact has status:Has errors"
-msgstr "?contact has status:Har feilmeldinger"
+msgstr "?contact has status:Har feil"
 
 #: gajim/common/helpers.py:427
 msgid "?Subscription we already have:None"
@@ -7670,7 +7532,7 @@ msgstr "?Ask (for Subscription):Ingen"
 
 #: gajim/common/helpers.py:443
 msgid "Subscribe"
-msgstr "Abonnér"
+msgstr "Abonner"
 
 #: gajim/common/helpers.py:452
 msgid "?Group Chat Contact Role:None"
@@ -7678,11 +7540,11 @@ msgstr "?Group Chat Contact Role:Ingen"
 
 #: gajim/common/helpers.py:455
 msgid "Moderators"
-msgstr "Ordstyrere"
+msgstr "Moderatorer"
 
 #: gajim/common/helpers.py:457
 msgid "Moderator"
-msgstr "Ordstyrer"
+msgstr "Moderator"
 
 #: gajim/common/helpers.py:460
 msgid "Participants"
@@ -7702,20 +7564,20 @@ msgstr "Besøk"
 
 #: gajim/common/helpers.py:518
 msgid "is paying attention to the conversation"
-msgstr "er fokusert på en annen samtale"
+msgstr "fokuserer på samtalen"
 
 #: gajim/common/helpers.py:520
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
 #: gajim/common/helpers.py:522
-#, fuzzy
 msgid "is composing a message…"
-msgstr "skriver en melding..."
+msgstr ""
+"tilkjennegir blodets hvisken og benpipernes bøn fra det ubevisste sjeleliv…"
 
 #: gajim/common/helpers.py:525
 msgid "paused composing a message"
-msgstr "tok pause i skriving av en melding"
+msgstr "tok pause i meldingsskrivingen"
 
 #: gajim/common/helpers.py:527
 msgid "has closed the chat window or tab"
@@ -7764,17 +7626,17 @@ msgstr[0] "%d melding venter"
 msgstr[1] "%d meldinger venter"
 
 #: gajim/common/helpers.py:1155
-#, fuzzy, python-format
+#, python-format
 msgid "from room %s"
-msgstr "fra rom %s"
+msgstr "fra rommet %s"
 
 #: gajim/common/helpers.py:1158 gajim/common/helpers.py:1175
-#, fuzzy, python-format
+#, python-format
 msgid "from user %s"
-msgstr "fra bruker %s"
+msgstr "fra brukeren %s"
 
 #: gajim/common/helpers.py:1160
-#, fuzzy, python-format
+#, python-format
 msgid "from %s"
 msgstr "fra %s"
 
@@ -7798,55 +7660,57 @@ msgstr "Gajim - %s"
 
 #: 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."
+msgstr "Jeg vil legge deg til i kontaktlisten min."
 
 #: gajim/common/helpers.py:1394
 msgid "Hello, I am $name."
-msgstr ""
+msgstr "Hei, jeg er $name."
 
 #: 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"
+msgstr "Tidsavbrudd ved innlasting av bilde"
 
 #: gajim/common/helpers.py:1527 gajim/common/helpers.py:1574
 msgid "Image is too big"
-msgstr "Bilde er for stort"
+msgstr "Bildet er for stort"
 
 #: gajim/common/helpers.py:1538
-#, fuzzy
 msgid "PyCURL is not installed"
-msgstr "CRL er ikke gyldig enda"
+msgstr "PyCURL er ikke intallert"
 
 #: gajim/common/helpers.py:1578
-#, fuzzy
 msgid "Error loading image"
-msgstr "Tidsavbrudd ved lasting av bilde"
+msgstr "Feil ved innlasting av bilde"
 
 #: 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"
+msgstr "Registreringsinformasjon for transporten %s kom ikke tidsnok"
 
 #: gajim/common/connection_handlers.py:979
 msgid "This message was encrypted with OTR and could not be decrypted."
-msgstr ""
+msgstr "Meldingen har blitt kryptert med OTR og kunne ikke dekrypteres."
 
 #: 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 ""
+"Meldingen har blitt kryptert med foreldet OpenPGP, og kunne ikke "
+"dekrypteres. Du kan installere PGP-programtillegget for å håndtere de "
+"meldingene."
 
 #: gajim/common/connection_handlers.py:986
 msgid ""
 "This message was encrypted with OpenPGP for XMPP and could not be decrypted."
 msgstr ""
+"Meldingen har blitt kryptert med OpenPGP for XMPP, og kunne ikke dekrypteres."
 
 #: gajim/common/connection_handlers.py:992
 #, python-format
 msgid "This message was encrypted with %s and could not be decrypted."
-msgstr ""
+msgstr "Meldingen har blitt kryptert med %s og kunne ikke dekrypteres."
 
 #: gajim/common/connection_handlers.py:1060
 msgid "message"
@@ -7857,40 +7721,43 @@ msgid "I would like to add you to my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
 #: 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 ""
-"Database filen (%s) kan ikke leses. Prøv å reparer den (se http://trac.gajim."
-"org/wiki/DatabaseBackup) eller fjern den (all historikk vil bli borte)."
+"Databasefilen (%s) kan ikke leses. Prøv å reparer den (se https://dev.gajim."
+"org/gajim/gajim/wikis/help/DatabaseBackup) eller fjern den (all historikk "
+"vil bli borte)."
 
 #: gajim/common/exceptions.py:60
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Tjeneste ikke tilgjengelig: Gajim kjører ikke, eller remote_control er satt "
-"til False"
+"til usant"
 
 #: gajim/common/exceptions.py:82
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Session bus is not available.\n"
 "Try reading %(url)s"
-msgstr "Sesjons buss ikke tilgjengelig"
+msgstr ""
+"Økt-bussen er ikke tilgjengelig.\n"
+"Prøv å lese %(url)s"
 
 #: gajim/common/exceptions.py:94
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "System bus is not available.\n"
 "Try reading %(url)s"
 msgstr ""
-"Sesjons bussen er ikke tilgjengelig.\n"
-"Prøv å les http://trac.gajim.org/wiki/GajimDBus"
+"Økt-bussen er ikke tilgjengelig.\n"
+"Prøv å lese %(url)s"
 
 #: 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."
+msgstr "Sjekk om Avahi eller Bonjour er installert."
 
 #: gajim/common/zeroconf/connection_zeroconf.py:220
 #: gajim/common/zeroconf/connection_zeroconf.py:224
@@ -7900,35 +7767,35 @@ msgstr "Kunne ikke starte lokal tjeneste"
 #: gajim/common/zeroconf/connection_zeroconf.py:221
 #, python-format
 msgid "Unable to bind to port %d."
-msgstr "Klarer ikke å lytte til port %d."
+msgstr "Klarer ikke å binde til port %d."
 
 #: 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."
+msgstr "Sjekk om Avahi-nissen kjører."
 
 #: 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\""
+msgstr "Kunne ikke endre statusen tilhørende kontoen \"%s\""
 
 #: gajim/common/zeroconf/connection_zeroconf.py:354
 msgid "Your message could not be sent."
-msgstr "Din melding kunne ikke bli sendt."
+msgstr "Din melding kunne ikke sendes."
 
 #: 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."
+msgstr "Kontakten er frakoblet. Din melding kunne ikke sendes."
 
 #: gajim/common/zeroconf/connection_zeroconf.py:391
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
-"Tilkobling til maskinen kunne ikke opprettes: Tidsutløp under sending av "
+"Tilkobling til maskinen kunne ikke opprettes: Tidsutløp under forsenelse av "
 "data."
 
 #: gajim/common/zeroconf/zeroconf_bonjour.py:197
@@ -7939,11 +7806,11 @@ msgstr "Feil ved tilføying av tjeneste. %s"
 
 #: gajim/data/gui/blocked_contacts_window.ui:13
 msgid "Blocked Contacts"
-msgstr "Blokkerte Kontakter"
+msgstr "Blokkerte kontakter"
 
 #: gajim/data/gui/advanced_configuration_window.ui:13
 msgid "Advanced Configuration Editor"
-msgstr "Avansert Konfigurasjons Editor"
+msgstr "Avansert oppsettsbehandlder"
 
 #: gajim/data/gui/advanced_configuration_window.ui:35
 msgid "Filter:"
@@ -7957,69 +7824,60 @@ msgstr "<b>Beskrivelse</b>"
 #: gajim/data/gui/advanced_configuration_window.ui:136
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
-"<b>MERK:</b> Du bør starte gajim på nytt for å aktivere noen instillinger"
+"<b>MERK:</b> Du bør starte Gajim på nytt for at noen instillinger skal "
+"aktiveres"
 
 #: gajim/data/gui/advanced_configuration_window.ui:161
-#, fuzzy
 msgid "_Reset to default"
-msgstr "_Tilbakestill til Standard Farger"
+msgstr "_Tilbakestill til forvalg"
 
 #: gajim/data/gui/join_groupchat_window.ui:34
-#, fuzzy
 msgid "Bookmark this Groupchat"
-msgstr "Bokmerke dette rommet"
+msgstr "Bokmerk denne gruppesludringen"
 
 #: gajim/data/gui/join_groupchat_window.ui:51
 msgid "Join this Groupchat everytime Gajim is started"
-msgstr ""
+msgstr "Ta del i denne gruppesludringen hver gang Gajim startes"
 
 #: gajim/data/gui/join_groupchat_window.ui:69
-#, fuzzy
 msgid "Bookmark"
-msgstr "_Bokmerke"
+msgstr "Bokmerke"
 
 #: gajim/data/gui/join_groupchat_window.ui:82
-#, fuzzy
 msgid "Autojoin"
-msgstr "Auto bli med"
+msgstr "Bli med automatisk"
 
 #: gajim/data/gui/join_groupchat_window.ui:119
 msgid "Account"
 msgstr "Konto"
 
 #: gajim/data/gui/join_groupchat_window.ui:226
-#, fuzzy
 msgid "Room"
-msgstr "Rom:"
+msgstr "Rom"
 
 #: gajim/data/gui/join_groupchat_window.ui:238
-#, fuzzy
 msgid "Recently"
-msgstr "Nylig:"
+msgstr "Nylig"
 
 #: gajim/data/gui/join_groupchat_window.ui:290
 msgid "Search the rooms on this server"
-msgstr ""
+msgstr "Søk i rommene på denne tjeneren"
 
 #: gajim/data/gui/manage_proxies_window.ui:12
-#, fuzzy
 msgid "HTTP Connect"
-msgstr ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+msgstr "HTTP-tilkobling"
 
 #: gajim/data/gui/manage_proxies_window.ui:15
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: gajim/data/gui/manage_proxies_window.ui:18
 msgid "BOSH"
-msgstr ""
+msgstr "BOSH"
 
 #: gajim/data/gui/manage_proxies_window.ui:25
 msgid "Manage Proxy Profiles"
-msgstr "Behandle Proxy Profiler"
+msgstr "Behandle mellomtjener-profiler"
 
 #: gajim/data/gui/manage_proxies_window.ui:148
 msgid "_Name:"
@@ -8035,23 +7893,23 @@ msgstr "<b>Egenskaper</b>"
 
 #: gajim/data/gui/manage_proxies_window.ui:234
 msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgstr "_BOSH-nettadresse:"
 
 #: gajim/data/gui/manage_proxies_window.ui:258
 msgid "Proxy _Host:"
-msgstr "Proxy _Host:"
+msgstr "_Vert for mellomtjener:"
 
 #: gajim/data/gui/manage_proxies_window.ui:269
 msgid "Use HTTP prox_y"
-msgstr "Bruk HTTP prox_y"
+msgstr "Bruk HTTP-mellomtjene_r"
 
 #: gajim/data/gui/manage_proxies_window.ui:288
 msgid "Proxy _Port:"
-msgstr "Proxy _Port:"
+msgstr "Mellomtjener-_port:"
 
 #: gajim/data/gui/manage_proxies_window.ui:299
 msgid "Use proxy auth_entication"
-msgstr "Bruk proxy aut_entisering"
+msgstr "Bruk bekreft_else av mellomtjener"
 
 #: gajim/data/gui/manage_proxies_window.ui:318
 msgid "_Username:"
@@ -8071,7 +7929,7 @@ msgstr "Skriv inn nytt passord:"
 
 #: gajim/data/gui/change_password_dialog.ui:115
 msgid "Enter it again for confirmation:"
-msgstr "Skriv inn en gang til for verifisering:"
+msgstr "Skriv inn én gang til å bekrefte:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:8
 #: gajim/data/gui/vcard_information_window.ui:8
@@ -8080,7 +7938,7 @@ msgstr "Kontaktinformasjon"
 
 #: gajim/data/gui/zeroconf_information_window.ui:54
 msgid "Local jid:"
-msgstr "Lokal jid:"
+msgstr "Lokal JID:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:67
 #: gajim/data/gui/tooltip_roster_contact.ui:55
@@ -8094,9 +7952,9 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
-msgstr "_Logg samtale historikk"
+msgstr "_Loggfør samtalehistorikk"
 
 #: gajim/data/gui/zeroconf_information_window.ui:215
 #: gajim/data/gui/vcard_information_window.ui:360
@@ -8116,11 +7974,11 @@ msgstr "Etternavn:"
 #: gajim/data/gui/tooltip_roster_contact.ui:30
 #: gajim/data/gui/tooltip_gc_contact.ui:50
 msgid "Jabber ID:"
-msgstr "Jabber ID:"
+msgstr "XMPP-ID:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:273
 msgid "E-Mail:"
-msgstr "E-Post:"
+msgstr "E-post:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:354
 msgid "Personal"
@@ -8128,15 +7986,15 @@ msgstr "Personlige"
 
 #: gajim/data/gui/gc_occupants_menu.ui:12
 msgid "_Send Private Message"
-msgstr "_Send Privat Melding"
+msgstr "_Send privat melding"
 
 #: gajim/data/gui/gc_occupants_menu.ui:21
 msgid "Send _File"
-msgstr "Send _Fil"
+msgstr "Send _fil"
 
 #: gajim/data/gui/gc_occupants_menu.ui:29
 msgid "Occupant Actions"
-msgstr "Beboer Handlinger"
+msgstr "Deltager-handlinger"
 
 #: gajim/data/gui/gc_occupants_menu.ui:38
 msgid "_Voice"
@@ -8144,7 +8002,7 @@ msgstr "_Stemme"
 
 #: gajim/data/gui/gc_occupants_menu.ui:46
 msgid "Mo_derator"
-msgstr "M_odererer"
+msgstr "M_oderator"
 
 #: gajim/data/gui/gc_occupants_menu.ui:60
 msgid "_Member"
@@ -8164,14 +8022,13 @@ msgstr "_Kast ut"
 
 #: gajim/data/gui/gc_occupants_menu.ui:98
 msgid "_Ban"
-msgstr "_Utvis"
+msgstr "_Bannlys"
 
 #: gajim/data/gui/gc_occupants_menu.ui:124
 msgid "_Add to Roster"
-msgstr "_Legg til Kontaktliste"
+msgstr "_Legg til i kontaktliste"
 
 #: gajim/data/gui/gc_occupants_menu.ui:132
-#, fuzzy
 msgid "_Execute command"
 msgstr "_Kjør Kommando"
 
@@ -8179,27 +8036,23 @@ msgstr "_Kjør Kommando"
 #: gajim/data/gui/preferences_window.ui:102
 #: gajim/data/gui/preferences_window.ui:153
 #: gajim/data/gui/archiving_313_preferences_window.ui:25
-#, fuzzy
 msgid "Always"
-msgstr "Borte"
+msgstr "Alltid"
 
 #: gajim/data/gui/archiving_313_preferences_item.ui:15
 #: gajim/data/gui/preferences_window.ui:96
 #: gajim/data/gui/preferences_window.ui:156
 #: gajim/data/gui/archiving_313_preferences_window.ui:31
-#, fuzzy
 msgid "Never"
-msgstr "_Aldri"
+msgstr "Aldri"
 
 #: gajim/data/gui/archiving_313_preferences_item.ui:96
-#, fuzzy
 msgid "Preference:"
-msgstr "Tilstedeværelse"
+msgstr "Preferanse:"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:125
-#, fuzzy
 msgid "Idle since:"
-msgstr " siden %s"
+msgstr "Uvirksom siden:"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:151
 #: gajim/data/gui/change_status_message_dialog.ui:191
@@ -8212,19 +8065,16 @@ msgid "Activity:"
 msgstr "Aktivitet:"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:178
-#, fuzzy
 msgid "Tune:"
 msgstr "Sang:"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:191
-#, fuzzy
 msgid "Location:"
-msgstr "Varslinger"
+msgstr "Plassering:"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:255
-#, fuzzy
 msgid "OpenPGP:"
-msgstr "OpenPGP: "
+msgstr "OpenPGP:"
 
 #: gajim/data/gui/tooltip_roster_contact.ui:281
 msgid "Subscription:"
@@ -8238,19 +8088,19 @@ msgstr "_Status"
 #: gajim/data/gui/zeroconf_context_menu.ui:26
 #: gajim/data/gui/account_context_menu.ui:79
 msgid "_Modify Account..."
-msgstr "_Rediger Konto..."
+msgstr "_Endre konto…"
 
 #: gajim/data/gui/atom_entry_window.ui:8
 msgid "New entry received"
-msgstr "Ny hendelse motatt"
+msgstr "Ny hendelse mottatt"
 
 #: gajim/data/gui/atom_entry_window.ui:92
 msgid "Feed name:"
-msgstr "Feed navn:"
+msgstr "Informasjonskildens navn:"
 
 #: gajim/data/gui/atom_entry_window.ui:119
 msgid "Entry:"
-msgstr "Entry:"
+msgstr "Oppføring:"
 
 #: gajim/data/gui/atom_entry_window.ui:131
 msgid "Last modified:"
@@ -8258,40 +8108,39 @@ msgstr "Sist endret:"
 
 #: gajim/data/gui/atom_entry_window.ui:196
 msgid "Next entry"
-msgstr ""
+msgstr "Neste oppføring"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:11
 msgid "Change _Nickname..."
-msgstr "Endre _Kallenavn..."
+msgstr "Endre _kallenavn…"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:20
 msgid "_Manage Room"
-msgstr "_Behandle Rom"
+msgstr "_Valg for rom"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:31
 msgid "Change _Subject..."
-msgstr "Endre _Tittel..."
+msgstr "Endre _tema…"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:38
 msgid "Configure _Room..."
-msgstr "Konfigurer _Rom..."
+msgstr "Sett opp _rom…"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:52
 msgid "_Destroy Room"
-msgstr "_Ødelegg Rom"
+msgstr "_Kanseller rom"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:64
 msgid "_Minimize on close"
 msgstr "_Minimer ved lukking"
 
 #: gajim/data/gui/gc_control_popup_menu.ui:85
-#, fuzzy
 msgid "_Request Voice"
-msgstr "_Stemme"
+msgstr "_Forespør stemmegratiale"
 
 #: gajim/data/gui/profile_window.ui:7
 msgid "Personal Information"
-msgstr "Personlig Informasjon"
+msgstr "Personlig informasjon"
 
 #: gajim/data/gui/profile_window.ui:35
 #: gajim/data/gui/vcard_information_window.ui:382
@@ -8325,18 +8174,18 @@ msgstr "<b>Mellomnavn:</b>"
 #: gajim/data/gui/profile_window.ui:156
 #: gajim/data/gui/vcard_information_window.ui:766
 msgid "<b>Prefix:</b>"
-msgstr "<b>Prefiks:</b>"
+msgstr "<b>Forstavelse:</b>"
 
 #. Suffix in Name
 #: gajim/data/gui/profile_window.ui:190
 #: gajim/data/gui/vcard_information_window.ui:835
 msgid "<b>Suffix:</b>"
-msgstr "<b>Suffiks:</b>"
+msgstr "<b>Endelse:</b>"
 
 #: gajim/data/gui/profile_window.ui:222
 #: gajim/data/gui/vcard_information_window.ui:878
 msgid "<b>Full Name</b>"
-msgstr "<b>Fullt Navn</b>"
+msgstr "<b>Fullt navn</b>"
 
 #: gajim/data/gui/profile_window.ui:250 gajim/data/gui/profile_window.ui:724
 #: gajim/data/gui/vcard_information_window.ui:454
@@ -8348,7 +8197,7 @@ msgstr "<b>Gate:</b>"
 #: gajim/data/gui/vcard_information_window.ui:535
 #: gajim/data/gui/vcard_information_window.ui:1126
 msgid "<b>Extra Address:</b>"
-msgstr "<b>Ekstra Adresse:</b>"
+msgstr "<b>Ekstra adresse:</b>"
 
 #: gajim/data/gui/profile_window.ui:298 gajim/data/gui/profile_window.ui:772
 #: gajim/data/gui/vcard_information_window.ui:467
@@ -8360,13 +8209,13 @@ msgstr "<b>By:</b>"
 #: gajim/data/gui/vcard_information_window.ui:548
 #: gajim/data/gui/vcard_information_window.ui:1140
 msgid "<b>Postal Code:</b>"
-msgstr "<b>Post Kode:</b>"
+msgstr "<b>Postkode:</b>"
 
 #: gajim/data/gui/profile_window.ui:346 gajim/data/gui/profile_window.ui:820
 #: gajim/data/gui/vcard_information_window.ui:480
 #: gajim/data/gui/vcard_information_window.ui:1113
 msgid "<b>State:</b>"
-msgstr "<b>Stat:</b>"
+msgstr "<b>Fylke:</b>"
 
 #: gajim/data/gui/profile_window.ui:370 gajim/data/gui/profile_window.ui:844
 #: gajim/data/gui/vcard_information_window.ui:561
@@ -8389,7 +8238,7 @@ msgstr "<b>Hjemmeside:</b>"
 #: gajim/data/gui/vcard_information_window.ui:648
 #: gajim/data/gui/vcard_information_window.ui:1270
 msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Post:</b>"
+msgstr "<b>E-post:</b>"
 
 #: gajim/data/gui/profile_window.ui:462 gajim/data/gui/profile_window.ui:912
 #: gajim/data/gui/vcard_information_window.ui:661
@@ -8403,12 +8252,12 @@ msgstr "<b>Avatar:</b>"
 
 #: gajim/data/gui/profile_window.ui:540
 msgid "Click to set your avatar"
-msgstr "Klikk for å sette ditt kontaktbilde"
+msgstr "Klikk for å sette din avatar"
 
 #: gajim/data/gui/profile_window.ui:566
 #: gajim/data/gui/vcard_information_window.ui:702
 msgid "Format: YYYY-MM-DD"
-msgstr "Format: YYYY-MM-DD"
+msgstr "Format: Ã…Ã…Ã…Ã…-MM-DD"
 
 #: gajim/data/gui/profile_window.ui:574
 #: gajim/data/gui/vcard_information_window.ui:708
@@ -8418,7 +8267,7 @@ msgstr "<b>Fødselsdag:</b>"
 #: gajim/data/gui/profile_window.ui:598
 #: gajim/data/gui/vcard_information_window.ui:937
 msgid "Personal Info"
-msgstr "Personlig Info"
+msgstr "Personalia"
 
 #: gajim/data/gui/profile_window.ui:617
 #: gajim/data/gui/vcard_information_window.ui:960
@@ -8453,9 +8302,8 @@ msgid "About"
 msgstr "Om"
 
 #: gajim/data/gui/filetransfers.ui:20
-#, fuzzy
 msgid "Con_tinue"
-msgstr "_Fortsett"
+msgstr "For_tsett"
 
 #: gajim/data/gui/filetransfers.ui:28 gajim/data/gui/filetransfers.ui:156
 msgid "_Pause"
@@ -8468,19 +8316,19 @@ msgstr "_Avbryt"
 
 #: gajim/data/gui/filetransfers.ui:50
 msgid "_Open Containing Folder"
-msgstr "_Ã…pne Foreldre Katalog"
+msgstr "_Ã…pne inneholdende katalog"
 
 #: gajim/data/gui/filetransfers.ui:79 gajim/data/gui/filetransfers.ui:253
 msgid "File Transfers"
-msgstr "Fil Overføringer"
+msgstr "Filoverføringer"
 
 #: gajim/data/gui/filetransfers.ui:110
 msgid "file transfers list"
-msgstr "fil overførings liste"
+msgstr "filoverføringsliste"
 
 #: 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"
+msgstr "En liste over aktive, fullførte og stoppede filoverføringer"
 
 #: gajim/data/gui/filetransfers.ui:131
 msgid "Clean _up"
@@ -8488,24 +8336,23 @@ msgstr "Rydd _opp"
 
 #: 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"
+msgstr "Fjerner fullførte, avbrutte og feilede filoverføringer fra listen"
 
 #: gajim/data/gui/filetransfers.ui:143
 msgid "Remove file transfer from the list."
-msgstr "Fjern filoverføringen fra listen"
+msgstr "Fjern filoverføringen fra listen."
 
 #: 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 ""
-"Dette valget fjerner en filoverføring fra listen. Dersom den er aktiv vil "
-"den først bli stoppet og så fjernet."
+"Dette valget fjerner ei filoverføring fra listen. Dersom den er aktiv vil "
+"den først bli stoppet og så fjernet"
 
 #: 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"
+msgstr "Avbryter valgte overføringer og fjerner uferdige filer"
 
 #: gajim/data/gui/filetransfers.ui:186
 msgid "Cancel file transfer"
@@ -8513,12 +8360,11 @@ msgstr "Avbryt filoverføring"
 
 #: gajim/data/gui/filetransfers.ui:187
 msgid "Cancels the selected file transfer"
-msgstr "Avbryter valgte filoverføring"
+msgstr "Avbryter valgt filoverføring"
 
 #: gajim/data/gui/filetransfers.ui:199
-#, fuzzy
 msgid "_Close"
-msgstr "_Send & Lukk"
+msgstr "_Lukk"
 
 #: gajim/data/gui/filetransfers.ui:205
 msgid "Hides the window"
@@ -8526,15 +8372,15 @@ msgstr "Lukker vinduet"
 
 #: 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"
+msgstr "_Gi meg beskjed når ei filoverføring er fullført"
 
 #: 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"
+msgstr "Vis oppsprettsvarsel når ei filoverføring er fullført"
 
 #: 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"
+msgstr "Viser en liste over filoverføringer mellom deg og andre"
 
 #: gajim/data/gui/service_registration_window.ui:18
 msgid "Register to"
@@ -8561,93 +8407,79 @@ msgstr "Understrek"
 
 #: gajim/data/gui/groupchat_control.ui:40 gajim/data/gui/chat_control.ui:320
 msgid "Strike"
-msgstr "Streik"
+msgstr "Gjennomstrek"
 
 #: gajim/data/gui/groupchat_control.ui:62 gajim/data/gui/chat_control.ui:342
 msgid "Font"
-msgstr "Font"
+msgstr "Skrift"
 
 #: gajim/data/gui/groupchat_control.ui:76 gajim/data/gui/chat_control.ui:356
-#, fuzzy
 msgid "Clear formatting"
-msgstr "Fjern formattering"
+msgstr "Fjern formatering"
 
 #: gajim/data/gui/groupchat_control.ui:280 gajim/data/gui/chat_control.ui:801
-#, fuzzy
 msgid "Choose an encryption"
-msgstr "Velg Fil for Sending..."
+msgstr "Velg kryptering"
 
 #: 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)"
+msgstr "Vis en liste over smilefjes (Alt+M)"
 
 #: gajim/data/gui/popup_notification_window.ui:55
-#, fuzzy
 msgid "Event Type"
-msgstr "Hendelse"
+msgstr "Hendelsestype"
 
 #: gajim/data/gui/popup_notification_window.ui:100
-#, fuzzy
 msgid "Event desc"
-msgstr "Hendelser"
+msgstr "Hendelsesbeskrivelse"
 
 #: gajim/data/gui/chat_control.ui:41
-#, fuzzy
 msgid "<b>1</b>"
-msgstr "<b>Font</b>"
+msgstr "<b>1</b>"
 
 #: gajim/data/gui/chat_control.ui:63
-#, fuzzy
 msgid "<b>2</b> abc"
-msgstr "<b>Font</b>"
+msgstr "<b>2</b> abc"
 
 #: gajim/data/gui/chat_control.ui:84
-#, fuzzy
 msgid "<b>3</b> def"
-msgstr "<b>Font</b>"
+msgstr "<b>3</b> def"
 
 #: gajim/data/gui/chat_control.ui:105
-#, fuzzy
 msgid "<b>4</b> ghi"
-msgstr "<b>Font</b>"
+msgstr "<b>4</b> ghi"
 
 #: gajim/data/gui/chat_control.ui:126
-#, fuzzy
 msgid "<b>5</b> jkl"
-msgstr "<b>Font</b>"
+msgstr "<b>5</b> jkl"
 
 #: gajim/data/gui/chat_control.ui:147
-#, fuzzy
 msgid "<b>6</b> mno"
-msgstr "<b>Font</b>"
+msgstr "<b>6</b> mno"
 
 #: gajim/data/gui/chat_control.ui:167
 msgid "<b>7</b> pqrs"
-msgstr ""
+msgstr "<b>7</b> pqrs"
 
 #: gajim/data/gui/chat_control.ui:188
-#, fuzzy
 msgid "<b>8</b> tuv"
-msgstr "<b>Font</b>"
+msgstr "<b>8</b> tuv"
 
 #: gajim/data/gui/chat_control.ui:209
 msgid "<b>9</b> wxyz"
-msgstr ""
+msgstr "<b>9</b> wxyz"
 
 #: gajim/data/gui/chat_control.ui:229
-#, fuzzy
 msgid "<b>*</b>"
-msgstr "<b>Font</b>"
+msgstr "<b>*</b>"
 
 #: gajim/data/gui/chat_control.ui:249
-#, fuzzy
 msgid "<b>0</b>"
-msgstr "<b>Font</b>"
+msgstr "<b>0</b>"
 
 #: gajim/data/gui/chat_control.ui:269
-#, fuzzy
 msgid "<b>#</b>"
-msgstr "<b>Font</b>"
+msgstr "<b>#</b>"
 
 #: gajim/data/gui/chat_control.ui:725
 msgid "#"
@@ -8655,7 +8487,7 @@ msgstr "#"
 
 #: gajim/data/gui/vcard_information_window.ui:55
 msgid "<b>Jabber ID:</b>"
-msgstr "<b>Jabber ID:</b>"
+msgstr "<b>XMPP-ID:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:69
 msgid "<b>Resource:</b>"
@@ -8675,17 +8507,15 @@ msgstr "<b>System:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:125
 msgid "<b>Contact time:</b>"
-msgstr "<b>Kontakt tid:</b>"
+msgstr "<b>Kontakttid:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:222
-#, fuzzy
 msgid "<b>User avatar:</b>"
-msgstr "<b>Avatar:</b>"
+msgstr "<b>Bruker-avatar:</b>"
 
 #: gajim/data/gui/vcard_information_window.ui:234
-#, fuzzy
 msgid "<b>Configured avatar:</b>"
-msgstr "Konfigurert avatar:"
+msgstr "<b>Oppsatt avatar:</b>"
 
 #. Given Name
 #: gajim/data/gui/vcard_information_window.ui:263
@@ -8701,38 +8531,35 @@ msgstr "<b>Abbonement:</b>"
 #: gajim/data/gui/vcard_information_window.ui:912
 #: gajim/data/gui/vcard_information_window.ui:1310
 msgid "button"
-msgstr ""
+msgstr "knapp"
 
 #: gajim/data/gui/vcard_information_window.ui:1398
 msgid "Comments"
 msgstr "Kommentarer"
 
 #: gajim/data/gui/gajim_themes_window.ui:12
-#, fuzzy
 msgid "Account row"
-msgstr "Konto"
+msgstr "Konto-rad"
 
 #: gajim/data/gui/gajim_themes_window.ui:15
-#, fuzzy
 msgid "Group row"
-msgstr "Gruppe"
+msgstr "Gruppe-rad"
 
 #: gajim/data/gui/gajim_themes_window.ui:18
-#, fuzzy
 msgid "Contact row"
-msgstr "Kontakt"
+msgstr "Kontakt-rad"
 
 #: gajim/data/gui/gajim_themes_window.ui:21
 msgid "Chat Banner"
-msgstr ""
+msgstr "Samtale-parole"
 
 #: gajim/data/gui/gajim_themes_window.ui:28
 msgid "Gajim Themes Customization"
-msgstr "Gajim Tema Valg"
+msgstr "Egentilpasning av draktvalg for Gajim"
 
 #: gajim/data/gui/gajim_themes_window.ui:157
 msgid "Text _color:"
-msgstr "Tekst _farge:"
+msgstr "Tekst_farge:"
 
 #: gajim/data/gui/gajim_themes_window.ui:173
 msgid "_Background:"
@@ -8740,11 +8567,11 @@ msgstr "_Bakgrunn:"
 
 #: gajim/data/gui/gajim_themes_window.ui:189
 msgid "Text _font:"
-msgstr "Tekst _font:"
+msgstr "Tekst_skrift:"
 
 #: gajim/data/gui/gajim_themes_window.ui:207
 msgid "Font style:"
-msgstr "Font stil:"
+msgstr "Stil for skriftsnitt:"
 
 #: gajim/data/gui/gajim_themes_window.ui:375
 msgid "Composing"
@@ -8752,7 +8579,7 @@ msgstr "Skriver"
 
 #: gajim/data/gui/gajim_themes_window.ui:387
 msgid "Paused"
-msgstr "Pauset"
+msgstr "Satt på vent"
 
 #: gajim/data/gui/gajim_themes_window.ui:399
 msgid "Gone"
@@ -8771,17 +8598,16 @@ msgid ""
 "MUC Directed\n"
 "Messages"
 msgstr ""
-"MUC Sendte\n"
-"Meldinger"
+"MUC dirigerte\n"
+"meldinger"
 
 #: gajim/data/gui/gajim_themes_window.ui:510
 msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>Samtalestatus Fane Farger</b>"
+msgstr "<b>Fanefarge for samstalestatus</b>"
 
 #: gajim/data/gui/preferences_window.ui:48
-#, fuzzy
 msgid "Use default applications"
-msgstr "Alltid bruk OS/X standard applikasjoner"
+msgstr "Alltid bruk forvalgte programmer"
 
 #: gajim/data/gui/preferences_window.ui:51
 msgid "Custom"
@@ -8789,63 +8615,53 @@ msgstr "Egendefinert"
 
 #: gajim/data/gui/preferences_window.ui:62
 #: gajim/data/gui/preferences_window.ui:79
-#, fuzzy
 msgid "All chat states"
-msgstr "Alle statuser"
+msgstr "Alle samtalestatuser"
 
 #: gajim/data/gui/preferences_window.ui:65
 #: gajim/data/gui/preferences_window.ui:82
-#, fuzzy
 msgid "Composing only"
-msgstr "Skriver"
+msgstr "Bare skrivning"
 
 #: gajim/data/gui/preferences_window.ui:99
-#, fuzzy
 msgid "Only when pending events"
-msgstr ""
-"Aldri\n"
-"Bare når hendelser venter\n"
-"Alltid"
+msgstr "Bare ved utestående hendelser"
 
 #: gajim/data/gui/preferences_window.ui:113
-#, fuzzy
 msgid "Pop it up"
-msgstr "_Sprett opp"
+msgstr "I oppsprett"
 
 #: gajim/data/gui/preferences_window.ui:116
-#, fuzzy
 msgid "Notify me about it"
-msgstr "_Gi meg beskjed om det"
+msgstr "Gi meg beskjed om det"
 
 #: gajim/data/gui/preferences_window.ui:119
-#, fuzzy
 msgid "Show only in roster"
-msgstr "Vis bare i _kontaktliste"
+msgstr "Vis bare i kontaktliste"
 
 #: gajim/data/gui/preferences_window.ui:130
 msgid "Detached roster with detached chats"
-msgstr ""
+msgstr "Avhektet kontaktliste med avhektede samtaler"
 
 #: gajim/data/gui/preferences_window.ui:133
 msgid "Detached roster with single chat"
-msgstr ""
+msgstr "Avhektet kontaktliste med enkeltsående samtale"
 
 #: gajim/data/gui/preferences_window.ui:136
 msgid "Single window for everything"
-msgstr ""
+msgstr "Ett enkelt vindu for alt"
 
 #: gajim/data/gui/preferences_window.ui:139
 msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgstr "Avhektet kontaktliste med samtaler gruppert etter konto"
 
 #: gajim/data/gui/preferences_window.ui:142
 msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgstr "Avhektet kontaktliste med samtaler gruppert etter type"
 
 #: gajim/data/gui/preferences_window.ui:159
-#, fuzzy
 msgid "Last state"
-msgstr "Siste status: %s"
+msgstr "Siste tilstand"
 
 #: gajim/data/gui/preferences_window.ui:195
 #: gajim/data/gui/application_menu.ui:94 gajim/data/gui/shortcuts_window.ui:188
@@ -8854,38 +8670,37 @@ msgstr "Tilstedeværelse"
 
 #: gajim/data/gui/preferences_window.ui:237
 msgid "Display a_vatars of contacts in roster"
-msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
+msgstr "Viser a_vatarer for kontakter i kontaktlisten"
 
 #: gajim/data/gui/preferences_window.ui:241
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr ""
-"Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
-"og i gruppesamtaler"
+"Dersom valgt vil Gajim vise avatarer for kontakter i kontaktlistevinduet og "
+"i gruppesamtaler"
 
 #: gajim/data/gui/preferences_window.ui:255
 msgid "Display status _messages of contacts in roster"
-msgstr "Viser status _meldinger for kontakter i kontaktlisten"
+msgstr "Viser status_meldinger for kontakter i kontaktlisten"
 
 #: gajim/data/gui/preferences_window.ui:259
-#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name, in roster window and in group chats"
 msgstr ""
-"Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
-"i kontaktliste vinduet og i gruppesamtaler"
+"Dersom valgt vil Gajim vise statusmelding tilhørende kontakter under "
+"kontaktnavnet i kontaktlistevinduet og i gruppesludringer"
 
 #: gajim/data/gui/preferences_window.ui:273
-#, fuzzy
 msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
-msgstr "Vis h_umør til kontakter i kontaktlisten"
+msgstr ""
+"Vis e_kstra informasjon om kontakter i kontaktlista (humør, aktivitet, …)"
 
 #: gajim/data/gui/preferences_window.ui:277
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
-msgstr "Dersom valgt vil Gajim vise humør for kontakter i kontaktliste vinduet"
+msgstr "Dersom valgt vil Gajim vise humør for kontakter i kontaktlistevinduet"
 
 #: gajim/data/gui/preferences_window.ui:298
 msgid "Sort contacts by status"
@@ -8897,36 +8712,35 @@ msgstr "i _kontaktliste"
 
 #: gajim/data/gui/preferences_window.ui:325
 msgid "in _group chats"
-msgstr "i _gruppe samtale"
+msgstr "i _gruppesamtaler"
 
 #: gajim/data/gui/preferences_window.ui:354
 msgid "<b>Roster Appearance</b>"
-msgstr "<b>"
+msgstr "<b>Kontaktlistevisning</b>"
 
 #: gajim/data/gui/preferences_window.ui:384
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
 msgstr ""
-"Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
-"eller statiske grafiske uttrykksikoner"
+"Dersom dette ikke skrus av vil Gajim bytte ut ASCII-smil som ':)' med "
+"animerte eller statiske, billedlige smilefjes"
 
 #: gajim/data/gui/preferences_window.ui:390
 msgid "_Emoticons:"
-msgstr "_Uttrykksikoner:"
+msgstr "_Smilefjes:"
 
 #: gajim/data/gui/preferences_window.ui:406
 msgid "_Window behavior:"
 msgstr "_Vindusoppførsel:"
 
 #: gajim/data/gui/preferences_window.ui:420
-#, fuzzy
 msgid "_Show roster on startup:"
-msgstr "Vis _kontaktliste"
+msgstr "_Vis kontaktliste ved oppstart:"
 
 #: gajim/data/gui/preferences_window.ui:431
 msgid "_Ignore rich content in incoming messages"
-msgstr "_Ignorér rik tekst innhold i innkommende meldinger"
+msgstr "_Ignorer rikt tekstinnhold i innkommende meldinger"
 
 #: gajim/data/gui/preferences_window.ui:435
 msgid ""
@@ -8934,7 +8748,7 @@ msgid ""
 "Gajim will just display the raw message text."
 msgstr ""
 "Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom "
-"valgt vil Gajim kun vise rå meldings tekst."
+"valgt vil Gajim kun vise rå meldingstekst."
 
 #: gajim/data/gui/preferences_window.ui:449
 msgid "_Highlight misspelled words"
@@ -8946,26 +8760,25 @@ msgid ""
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 msgstr ""
-"Dersom valgt vil Gajim utheve skrivefeil i skrivefeltet i samtale vinduer. "
-"Dersom ikke noe språk er valgt med høyreklikking i feltet vil standard "
-"språkvalg brukes for denne kontakten eller gruppesamtale."
+"Dersom valgt vil Gajim utheve skrivefeil i skrivefeltet i samtalevinduer. "
+"Dersom språk ikke er valgt ved høyreklikking i feltet, vil forvalgt "
+"språkvalg brukes for denne kontakten, eller gruppesamtalen."
 
 #: gajim/data/gui/preferences_window.ui:466
-#, fuzzy
 msgid "Notify by icon when your messages are received"
-msgstr "Lyd som spilles når en ny samtalerom melding mottas."
+msgstr "Varsle med ikon når meldingene dine mottas"
 
 #: gajim/data/gui/preferences_window.ui:531
 msgid "Show avatar in chat tabs"
-msgstr ""
+msgstr "Vis avatar i sludrefaner"
 
 #: gajim/data/gui/preferences_window.ui:552
 msgid "<b>Chat Appearance</b>"
-msgstr "<b>Samtale Utseende</b>"
+msgstr "<b>Samtaleutseende</b>"
 
 #: gajim/data/gui/preferences_window.ui:607
 msgid "When new event is received:"
-msgstr "NÃ¥r en ny hendelse blir motatt:"
+msgstr "Ved mottak av ny hendelse:"
 
 #: gajim/data/gui/preferences_window.ui:645
 msgid "Notify me about contacts that sign _in"
@@ -8980,28 +8793,26 @@ msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr ""
-"Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
-"om at en kontakt har akkurat logget ut"
+"Gajim vil alarmere deg med oppspretts-vindu i bunnen til høyre på skjermen "
+"om at en kontakt akkurat har logget ut"
 
 #: gajim/data/gui/preferences_window.ui:681
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
-"Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
+"Tillat oppspretts/merknader når jeg er _borte/ikke tilgjengelig/opptatt/"
+"usynlig"
 
 #: gajim/data/gui/preferences_window.ui:698
-#, fuzzy
 msgid "Allow popup/notifications when a chat window is opened"
-msgstr ""
-"Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
+msgstr "Tillat oppsprett/merknader når et sludrevindu åpnes"
 
 #: gajim/data/gui/preferences_window.ui:722
-#, fuzzy
 msgid "Show notification area icon:"
-msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
+msgstr "Vis merknad i systemstatusfeltet (systray):"
 
 #: gajim/data/gui/preferences_window.ui:762
 msgid "<b>Visual Notifications</b>"
-msgstr "<b>Visuelle Alarmer</b>"
+msgstr "<b>Visuelle merknader</b>"
 
 #: gajim/data/gui/preferences_window.ui:795
 msgid "Play _sounds"
@@ -9010,7 +8821,7 @@ msgstr "Spill av _lyder"
 #: gajim/data/gui/preferences_window.ui:812
 #: gajim/data/gui/preferences_window.ui:1656
 msgid "Ma_nage..."
-msgstr "Be_handle..."
+msgstr "Be_handle…"
 
 #: gajim/data/gui/preferences_window.ui:834
 msgid "Allow sound when I'm _busy"
@@ -9022,7 +8833,7 @@ msgstr "<b>Lyder</b>"
 
 #: gajim/data/gui/preferences_window.ui:877
 msgid "Notifications"
-msgstr "Kunngjøringer"
+msgstr "Merknader"
 
 #: gajim/data/gui/preferences_window.ui:911
 msgid ""
@@ -9032,11 +8843,11 @@ msgid ""
 msgstr ""
 "Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha "
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
-"vise i samtale vinduer."
+"vise i samtalevinduer."
 
 #: gajim/data/gui/preferences_window.ui:916
 msgid "_Display chat state notifications:"
-msgstr "_Vis samtale status opplysninger:"
+msgstr "_Vis opplysninger for samtalestatus:"
 
 #: gajim/data/gui/preferences_window.ui:967
 msgid ""
@@ -9050,15 +8861,15 @@ msgstr ""
 
 #: gajim/data/gui/preferences_window.ui:972
 msgid "_Send chat state notifications:"
-msgstr "_Send Samtale status opplysninger:"
+msgstr "_Send samtalestatusmerknader:"
 
 #: gajim/data/gui/preferences_window.ui:990
 msgid "<b>Chat state notifications</b>"
-msgstr "<b>Samtale status alarmer</b>"
+msgstr "<b>Merknader for samtalestatus</b>"
 
 #: gajim/data/gui/preferences_window.ui:1012
 msgid "Personal Events"
-msgstr "Personlige Hendelser"
+msgstr "Personlige hendelser"
 
 #: gajim/data/gui/preferences_window.ui:1043
 msgid "_Away after:"
@@ -9094,10 +8905,10 @@ msgid ""
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-away timeout"
 msgstr ""
-"Automatisk borte status melding. Dersom tom vil Gajim ikke endre gjeldende "
-"status melding\n"
-"$S byttes ut av tidligere status melding\n"
-"$T byttest ut av automatisk-borte tidsavbrudd"
+"'Automatisk borte'-statusmelding. Dersom tom vil Gajim ikke endre gjeldende "
+"statusmelding\n"
+"$S byttes ut av tidligere brukt statusmelding\n"
+"$T byttest ut av 'Automatisk-borte'-tidsavbrudd"
 
 #: gajim/data/gui/preferences_window.ui:1117
 msgid ""
@@ -9106,34 +8917,34 @@ msgid ""
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
-"Automatisk ikke tilgjengelig meldingen. Dersom tom vil Gajim ikke endre "
-"gjeldende status melding\n"
+"Automatisk 'Ikke tilgjengelig'-melding. Dersom tom vil Gajim ikke endre "
+"gjeldende statusmelding\n"
 "$S vil byttes ut av forrige status melding\n"
-"$T vil byttes ut av automatisk-ikke-tilgjengelig tidsavbrudd"
+"$T vil byttes ut av automatisk 'Ikke-tilgjengelig'-tidsavbrudd"
 
 #: gajim/data/gui/preferences_window.ui:1165
 msgid "<b>Auto Status</b>"
-msgstr "<b>Automatisk Status</b>"
+msgstr "<b>Automatisk status</b>"
 
 #: gajim/data/gui/preferences_window.ui:1200
 msgid "Ask status message when I:"
-msgstr "Spør etter status melding når jeg:"
+msgstr "Spør etter statusmelding når jeg:"
 
 #: gajim/data/gui/preferences_window.ui:1215
 msgid "Sign _in"
-msgstr "Logger _inn"
+msgstr "Logg _inn"
 
 #: gajim/data/gui/preferences_window.ui:1232
 msgid "Sign _out"
-msgstr "Logger _ut"
+msgstr "Logg _ut"
 
 #: gajim/data/gui/preferences_window.ui:1265
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
-"Dersom valgt vil Gajim ikke spør for en status beskjed. Standard valget for "
-"beskjed vil benyttes isteden."
+"Dersom valgt vil Gajim ikke spørre etter statusmelding. Oppgitt forvalg for "
+"meldingen vil benyttes i steden for."
 
 #: gajim/data/gui/preferences_window.ui:1277
 #: gajim/data/gui/preferences_window.ui:1479
@@ -9142,7 +8953,7 @@ msgstr "Status"
 
 #: gajim/data/gui/preferences_window.ui:1288
 msgid "Default Message"
-msgstr "Standard Melding"
+msgstr "Forvalgt melding"
 
 #: gajim/data/gui/preferences_window.ui:1303
 msgid "Enabled"
@@ -9150,15 +8961,15 @@ msgstr "Påslått"
 
 #: gajim/data/gui/preferences_window.ui:1329
 msgid "<b>Status Messages</b>"
-msgstr "<b>Status Meldinger</b>"
+msgstr "<b>Statusmeldinger</b>"
 
 #: gajim/data/gui/preferences_window.ui:1459
 msgid "<b>Preset Status Messages</b>"
-msgstr "<b>Forvalgt Status Melding</b>"
+msgstr "<b>Forvalgt statusmelding</b>"
 
 #: gajim/data/gui/preferences_window.ui:1512
 msgid "Chat message:"
-msgstr "Samtale melding:"
+msgstr "Samtalemelding:"
 
 #: gajim/data/gui/preferences_window.ui:1537
 msgid "Use system _default"
@@ -9166,78 +8977,72 @@ msgstr "Bruk systemets _standardinstillinger"
 
 #: gajim/data/gui/preferences_window.ui:1560
 msgid "<b>Font</b>"
-msgstr "<b>Font</b>"
+msgstr "<b>Skrift</b>"
 
 #: gajim/data/gui/preferences_window.ui:1590
 msgid "T_heme:"
-msgstr "T_ema:"
+msgstr "D_rakt:"
 
 #: gajim/data/gui/preferences_window.ui:1603
 msgid "Status _iconset:"
-msgstr "Standard _ikonsamling:"
+msgstr "Standard _miniatyrbildesamling:"
 
 #: gajim/data/gui/preferences_window.ui:1614
 msgid "Use _transports icons"
-msgstr "Bruk _transport ikoner"
+msgstr "Bruk _transportens miniatyrbilder"
 
 #: gajim/data/gui/preferences_window.ui:1618
-#, fuzzy
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
 "from ICQ will have the equivalent ICQ icon for status online, away, busy, "
 "etc...)"
 msgstr ""
-"Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN "
-"vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
+"Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra ICQ "
+"vil ha tilsvarende ICQ-ikon for pålogget stastus, borte, opptatt, osv…)"
 
 #: gajim/data/gui/preferences_window.ui:1660
 msgid "Configure color and font of the interface"
-msgstr "Konfigurer farge og font for grensesnittet"
+msgstr "Sett opp farge og skrift for grensesnittet"
 
 #: gajim/data/gui/preferences_window.ui:1682
 msgid "<b>Themes</b>"
-msgstr "<b>Temaer</b>"
+msgstr "<b>Drakter</b>"
 
 #: gajim/data/gui/preferences_window.ui:1712
-#, fuzzy
 msgid "Contact's nickname:"
-msgstr "Kontakt navn"
+msgstr "Kontaktens kallenavn:"
 
 #: gajim/data/gui/preferences_window.ui:1726
-#, fuzzy
 msgid "Contact's message:"
-msgstr "Samtale melding:"
+msgstr "Kontaktens melding:"
 
 #: gajim/data/gui/preferences_window.ui:1738
 msgid "_Status message:"
-msgstr "_Status melding:"
+msgstr "_Statusmelding:"
 
 #: gajim/data/gui/preferences_window.ui:1752
-#, fuzzy
 msgid "Group chat highlight:"
-msgstr "Gruppe Samtale Melding Utheving"
+msgstr "Fremheving av gruppesamtale:"
 
 #: gajim/data/gui/preferences_window.ui:1890
-#, fuzzy
 msgid "Your nickname:"
-msgstr "F_ør kallenavn:"
+msgstr "Ditt kallenavn:"
 
 #: gajim/data/gui/preferences_window.ui:1904
-#, fuzzy
 msgid "Your message:"
-msgstr "Feil melding: %s"
+msgstr "Din melding:"
 
 #: gajim/data/gui/preferences_window.ui:1916
 msgid "_URL highlight:"
-msgstr "_URL utheving:"
+msgstr "_URL-uthevning:"
 
 #: gajim/data/gui/preferences_window.ui:2041
 msgid "_Reset to Default Colors"
-msgstr "_Tilbakestill til Standard Farger"
+msgstr "_Tilbakestill til forvalgte farger"
 
 #: gajim/data/gui/preferences_window.ui:2075
 msgid "<b>Chat Line Colors</b>"
-msgstr "<b>Samtale Linje Farger</b>"
+msgstr "<b>Samtalens linjefarger</b>"
 
 #: gajim/data/gui/preferences_window.ui:2095
 msgid "Style"
@@ -9245,65 +9050,63 @@ msgstr "Stil"
 
 #: gajim/data/gui/preferences_window.ui:2128
 msgid "Audio input device"
-msgstr ""
+msgstr "Lydenhet for mikrofon"
 
 #: gajim/data/gui/preferences_window.ui:2140
 msgid "Audio output device"
-msgstr ""
+msgstr "Lydenhet for avspilling"
 
 #: gajim/data/gui/preferences_window.ui:2176
-#, fuzzy
 msgid "<b>Audio</b>"
-msgstr "<b>Handlinger</b>"
+msgstr "<b>Lyd</b>"
 
 #: gajim/data/gui/preferences_window.ui:2206
 msgid "Video input device"
-msgstr ""
+msgstr "Videokamera-enhet"
 
 #: gajim/data/gui/preferences_window.ui:2218
 msgid "Video output device"
-msgstr ""
+msgstr "Videoforsendelses-enhet"
 
 #: gajim/data/gui/preferences_window.ui:2230
 msgid "Video framerate"
-msgstr ""
+msgstr "Bildetakt for video"
 
 #: gajim/data/gui/preferences_window.ui:2242
 msgid "Video size"
-msgstr ""
+msgstr "Videostørrelse"
 
 #: gajim/data/gui/preferences_window.ui:2252
 msgid "View own video source"
-msgstr ""
+msgstr "Vis egen videokilde"
 
 #: gajim/data/gui/preferences_window.ui:2316
-#, fuzzy
 msgid "<b>Video</b>"
-msgstr "<b>Mellomnavn:</b>"
+msgstr "<b>Video:</b>"
 
 #: gajim/data/gui/preferences_window.ui:2346
-#, fuzzy
 msgid "STUN server:"
-msgstr "Server:"
+msgstr "STUN-tjener:"
 
 #: gajim/data/gui/preferences_window.ui:2372
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
+"STUN-tjenerens vertsnavn. Hvis ikke noe er oppgitt, vil Gajim\n"
+"prøve å lete opp ett fra tjeneren."
 
 #: gajim/data/gui/preferences_window.ui:2386
 msgid "<i>(example: stun.iptel.org)</i>"
-msgstr ""
+msgstr "<i>(eksempel: stun.iptel.org)</i>"
 
 #: gajim/data/gui/preferences_window.ui:2400
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "<b>Betingelser</b>"
+msgstr "<b>Tilkobling</b>"
 
 #: gajim/data/gui/preferences_window.ui:2485
 msgid "_Mail client:"
-msgstr "_Post klient:"
+msgstr "_E-post-klient:"
 
 #: gajim/data/gui/preferences_window.ui:2498
 msgid "_Browser:"
@@ -9311,7 +9114,7 @@ msgstr "_Nettleser:"
 
 #: gajim/data/gui/preferences_window.ui:2511
 msgid "_File manager:"
-msgstr "_Fil behandler:"
+msgstr "_Filbehandler:"
 
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: gajim/data/gui/preferences_window.ui:2559
@@ -9320,11 +9123,11 @@ msgstr "<b>Egendefinert</b>"
 
 #: gajim/data/gui/preferences_window.ui:2576
 msgid "<b>Applications</b>"
-msgstr "<b>Applikasjoner</b>"
+msgstr "<b>Programmer</b>"
 
 #: gajim/data/gui/preferences_window.ui:2604
 msgid "_Ignore events from contacts not in the roster"
-msgstr "_Ignorér hendelser fra kontakter som ikke er i kontaktlisten"
+msgstr "_Ignorer hendelser fra kontakter som ikke er i kontaktlisten"
 
 #: gajim/data/gui/preferences_window.ui:2608
 msgid ""
@@ -9332,70 +9135,64 @@ msgid ""
 "Use with caution, because it blocks all messages from any contact that is "
 "not in the roster"
 msgstr ""
-"Dersom valgt vil Gajim ignorere inkommende hendelser fra uautoriserte "
-"kontakter. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle "
-"kontakter som ikke er i kontaktlisten"
+"Dersom valgt vil Gajim ignorere inkommende hendelser fra "
+"ubekreftedekontakter. Bruk med varsomhet, fordi det blokkerer alle meldinger "
+"fra alle kontakter som ikke er i kontaktlisten"
 
 #: gajim/data/gui/preferences_window.ui:2622
-#, fuzzy
 msgid "Allow client / _OS information to be sent"
-msgstr "Tillat _OS informasjon å bli sendt"
+msgstr "Tillat forsendelse av klient / _OS informasjon"
 
 #: gajim/data/gui/preferences_window.ui:2626
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr ""
-"Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
-"bruker"
+"Dersom valgt vil Gajim tillate at andre ser hvilket operativsystem du bruker"
 
 #: gajim/data/gui/preferences_window.ui:2640
-#, fuzzy
 msgid "Allow local system time information to be sent"
-msgstr "Tillat _OS informasjon å bli sendt"
+msgstr "Tillat forsendelse av lokal systemtid"
 
 #: gajim/data/gui/preferences_window.ui:2644
-#, fuzzy
 msgid "If checked, Gajim will allow others to detect the time on your system"
 msgstr ""
-"Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
+"Hvis avkrysset vil Gajim tillate at andre ser hvilket operativsystem du "
 "bruker"
 
 #: gajim/data/gui/preferences_window.ui:2658
 msgid "Log _encrypted chat session"
-msgstr "Logg _krypterte samtale sesjoner"
+msgstr "Loggfør _krypterte samtaleøkter"
 
 #: 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 ""
-"Dersom valgt vil Gajim ta vare på logger for krypterte meldinger. Vennligst "
-"husk at når man bruker E2E kryptering må den andre parten være enig i at "
-"logging er OK, ellers vil ikke beskjeder logges."
+"Dersom valgt vil Gajim ivareta loggføring for krypterte meldinger. Husk at "
+"når man bruker ende-til-ende -kryptering må den andre parten være enig i at "
+"logging er OK, ellers vil ikke meldinger logges."
 
 #: gajim/data/gui/preferences_window.ui:2676
-#, fuzzy
 msgid "Allow my _idle time to be sent"
-msgstr "Tillat _OS informasjon å bli sendt"
+msgstr "Tillat forsendelse av _uvirksomhetsinformasjon"
 
 #: gajim/data/gui/preferences_window.ui:2695
 msgid "Global proxy:"
-msgstr ""
+msgstr "Global mellomtjener:"
 
 #: gajim/data/gui/preferences_window.ui:2724
 msgid "_Manage..."
-msgstr "_Behandle..."
+msgstr "_Behandle…"
 
 #: gajim/data/gui/preferences_window.ui:2743
 msgid "<b>Privacy</b>"
-msgstr "<i>Privatliv</i>"
+msgstr "<b>Personvern</b>"
 
 #: gajim/data/gui/preferences_window.ui:2770
 msgid "_Log status changes of contacts"
-msgstr "_Logg status endringer til kontakter"
+msgstr "_Loggfør statusendringer tilhørende kontakter"
 
 #: gajim/data/gui/preferences_window.ui:2791
 msgid "<b>Miscellaneous</b>"
@@ -9403,72 +9200,68 @@ msgstr "<b>Diverse</b>"
 
 #: gajim/data/gui/preferences_window.ui:2810
 msgid "_Open..."
-msgstr "_Ã…pne..."
+msgstr "_Åpne…"
 
 #: gajim/data/gui/preferences_window.ui:2826
 msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Editering av Avanserte Instillinger</b>"
+msgstr "<b>Avansert oppsettsbehandling</b>"
 
 #: gajim/data/gui/contact_context_menu.ui:12
 msgid "Start _Chat"
-msgstr "Start _Samtale"
+msgstr "Start _samtale"
 
 #: gajim/data/gui/contact_context_menu.ui:20
 #: gajim/data/gui/systray_context_menu.ui:36
 msgid "Send Single _Message..."
-msgstr "Send Enkel _Melding..."
+msgstr "Send enkeltstående _melding…"
 
 #: gajim/data/gui/contact_context_menu.ui:28
 msgid "Send _File..."
-msgstr "Send _Fil..."
+msgstr "Send _fil…"
 
 #: gajim/data/gui/contact_context_menu.ui:44
 msgid "Invite _Contacts"
-msgstr "Inviter _Kontakter"
+msgstr "Inviter _kontakter"
 
 #: gajim/data/gui/contact_context_menu.ui:73
 msgid "E_xecute Command..."
-msgstr "K_jør Kommando..."
+msgstr "K_jør kommando…"
 
 #: gajim/data/gui/contact_context_menu.ui:82
-#, fuzzy
 msgid "M_anage Contact"
-msgstr "_Behandle Kontakt"
+msgstr "B_ehandle kontakt"
 
 #: gajim/data/gui/contact_context_menu.ui:92
 msgid "_Rename..."
-msgstr "_Gi nytt navn..."
+msgstr "_Gi nytt navn…"
 
 #: gajim/data/gui/contact_context_menu.ui:99
 msgid "Edit _Groups..."
-msgstr "Rediger _Grupper..."
+msgstr "Endre _grupper…"
 
 #: gajim/data/gui/contact_context_menu.ui:106
 msgid "Assign Open_PGP Key..."
-msgstr "Tilegn Open_PGP Nøkkel..."
+msgstr "Tilegn Open_PGP-nøkkel…"
 
 #: gajim/data/gui/contact_context_menu.ui:115
 msgid "Add Special _Notification..."
-msgstr "Legg til Spesielt _Varsel"
+msgstr "Legg til spesielt _varsel…"
 
 #: gajim/data/gui/contact_context_menu.ui:129
 msgid "_Subscription"
 msgstr "_Abonnement"
 
 #: gajim/data/gui/contact_context_menu.ui:138
-#, fuzzy
 msgid "_Allow contact to see my status"
-msgstr "Ti_llat denne kontakten å se min status"
+msgstr "_Tillat kontakt å se min status"
 
 #: gajim/data/gui/contact_context_menu.ui:146
-#, fuzzy
 msgid "A_sk to see contact status"
-msgstr "F_orespør å se hans/hennes status"
+msgstr "S_pør om å få se kontaktstatus"
 
 #: gajim/data/gui/contact_context_menu.ui:154
-#, fuzzy
 msgid "_Forbid contact to see my status"
-msgstr "_Forby han/henne å se min status"
+msgstr "_Forby kontakten fra å se min status"
 
 #: gajim/data/gui/contact_context_menu.ui:182
 msgid "_Unignore"
@@ -9481,19 +9274,19 @@ msgstr "_Ignorer"
 #: gajim/data/gui/contact_context_menu.ui:197
 #: gajim/data/gui/chat_context_menu.ui:66
 msgid "_Add to Roster..."
-msgstr "_Legg til Kontaktliste..."
+msgstr "_Legg til i kontaktliste…"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:43
 msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: Konto Opprettings Veiviser"
+msgstr "Gajim: Veiviser for konto-opprettelse"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:70
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
 msgstr ""
-"Du trenger en konto før du kan koble\n"
-"til Jabber nettverket."
+"En konto kreves for tilkobling\n"
+"til XMPP-nettverket."
 
 #: gajim/data/gui/account_creation_wizard_window.ui:95
 msgid "I already have an account I want to _use"
@@ -9505,20 +9298,20 @@ msgstr "Jeg ønsker å _registrere en ny konto"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:133
 msgid "<b>Please choose one of the options below:</b>"
-msgstr "<b>Vennligst velg ett av valgene under:</b>"
+msgstr "<b>Velg én av delene nedenfor:</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:167
 msgid "<b>Please fill in the data for your existing account</b>"
-msgstr "<b>Vennligst fyll in data for din eksisterende konto</b>"
+msgstr "<b>Fyll in detaljer for eksisterende konto</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:187
 msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgstr "_XMPP-ID:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:239
 #: gajim/data/gui/account_creation_wizard_window.ui:394
 msgid "Anon_ymous authentication"
-msgstr "Anon_ym autentisering"
+msgstr "Anon_ym identitetsbekreftelse"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:259
 #: gajim/data/gui/manage_bookmarks_window.ui:172
@@ -9535,20 +9328,20 @@ msgstr "Dersom valgt vil Gajim huske passordet for kontoen"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:339
 msgid "<b>Please select a server</b>"
-msgstr "<b>Vennligst velg en server</b>"
+msgstr "<b>Velg en tjener</b>"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:358
 #: gajim/data/gui/manage_bookmarks_window.ui:159
 msgid "_Server:"
-msgstr "_Server:"
+msgstr "_Tjener:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:423
 msgid "Prox_y:"
-msgstr "Prox_y:"
+msgstr "Mellomtjene_r:"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:450
 msgid "Manage..."
-msgstr "Behandle..."
+msgstr "Behandle…"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:465
 msgid "Use custom hostname/port"
@@ -9572,8 +9365,8 @@ msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"Legg til dette sertifikatet til listen over tiltrodde leverandører.\n"
-"SHA1 fingeravtrykk til sertifikatet:\n"
+"Legg dette sertifikatet til i listen over tiltrodde leverandører.\n"
+"SHA1-fingeravtrykk tilhørende sertifikat:\n"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:687
 msgid ""
@@ -9581,9 +9374,9 @@ msgid ""
 "\n"
 "Please wait..."
 msgstr ""
-"<b>Kobler til server</b>\n"
+"<b>Kobler til tjener</b>\n"
 "\n"
-"Vennligst vent..."
+"Vent…"
 
 #: gajim/data/gui/account_creation_wizard_window.ui:772
 msgid "Connect when I press Finish"
@@ -9599,7 +9392,7 @@ msgstr "_Avslutt"
 
 #: gajim/data/gui/privacy_lists_window.ui:34
 msgid "Privacy Lists:"
-msgstr "Liste over Uønskede:"
+msgstr "Personverns-lister:"
 
 #: gajim/data/gui/service_discovery_window.ui:84
 msgid "_Address:"
@@ -9611,19 +9404,19 @@ msgstr "G_Ã¥"
 
 #: gajim/data/gui/synchronise_select_contacts_dialog.ui:8
 msgid "Synchronise : select contacts"
-msgstr "Synkroniser : velg kontakter"
+msgstr "Samkjøring : velg kontakter"
 
 #: gajim/data/gui/synchronise_select_contacts_dialog.ui:67
 msgid "Select the contacts you want to synchronise"
-msgstr "Velg kontaktene du ønsker å synkronsiere"
+msgstr "Velg kontaktene du ønsker å flette"
 
 #: gajim/data/gui/edit_groups_dialog.ui:8
 msgid "Edit Groups"
-msgstr "Rediger Grupper"
+msgstr "Rediger grupper"
 
 #: gajim/data/gui/search_window.ui:42
 msgid "Please wait while retrieving search form..."
-msgstr "Vennligst vent, henter søke skjemaet..."
+msgstr "Vent på innhenting av søkeskjema…"
 
 #: gajim/data/gui/search_window.ui:80
 msgid "_Add contact"
@@ -9635,34 +9428,34 @@ msgstr "_Søk"
 
 #: gajim/data/gui/chat_context_menu.ui:11
 msgid "_Copy Link Location"
-msgstr "_Kopier Link PLassering"
+msgstr "_Kopier lenke-plassering"
 
 #: gajim/data/gui/chat_context_menu.ui:19
 msgid "_Open Link in Browser"
-msgstr "_Ã…pne Link i Nettleser"
+msgstr "_Ã…pne lenke i nettleser"
 
 #: gajim/data/gui/chat_context_menu.ui:27
 msgid "_Copy JID/Email Address"
-msgstr "_Kopier JID/E-post Adresse"
+msgstr "_Kopier JID/E-postadresse"
 
 #: gajim/data/gui/chat_context_menu.ui:35
 msgid "_Open Email Composer"
-msgstr "_Ã…pne ny Epost"
+msgstr "_Ã…pne E-post-behandler"
 
 #: gajim/data/gui/chat_context_menu.ui:49
 #: gajim/data/gui/subscription_request_window.ui:12
 msgid "_Start Chat"
-msgstr "_Start Samtale"
+msgstr "_Start samtale"
 
 #: gajim/data/gui/chat_context_menu.ui:57
 #: gajim/data/gui/account_context_menu.ui:35
 #: gajim/data/gui/systray_context_menu.ui:28
 msgid "Join _Group Chat"
-msgstr "Bli med i _Gruppe Samtale"
+msgstr "Ta del i en _gruppesamtale"
 
 #: gajim/data/gui/change_status_message_dialog.ui:131
 msgid "Save as Preset..."
-msgstr "Lagre som Forvalg..."
+msgstr "Lagre som forvalg…"
 
 #: gajim/data/gui/change_status_message_dialog.ui:167
 msgid "Preset messages:"
@@ -9670,42 +9463,39 @@ msgstr "Forvalgte meldinger:"
 
 #: gajim/data/gui/change_status_message_dialog.ui:313
 msgid "<b>Type your new status message</b>"
-msgstr "<b>Skriv inn din nye status melding:</b>"
+msgstr "<b>Skriv inn din nye statusmelding:</b>"
 
 #: gajim/data/gui/synchronise_select_account_dialog.ui:8
 msgid "Synchronise contacts"
-msgstr "_Synkroniser kontakter"
+msgstr "_Flett sammen kontakter"
 
 #: gajim/data/gui/synchronise_select_account_dialog.ui:68
 msgid "Select the account with which you want to synchronise"
-msgstr "Velg hvilken konto du du ønsker å synkronisere med"
+msgstr "Velg hvilken konto du ønsker å flette sammen med"
 
 #: gajim/data/gui/archiving_313_preferences_window.ui:28
-#, fuzzy
 msgid "Roster"
-msgstr "Vis _Kontaktliste"
+msgstr "Kontaktliste"
 
 #: gajim/data/gui/archiving_313_preferences_window.ui:85
-#, fuzzy
 msgid "Preference"
-msgstr "Tilstedeværelse"
+msgstr "Preferanse"
 
 #: gajim/data/gui/archiving_313_preferences_window.ui:159
-#, fuzzy
 msgid "Default:"
-msgstr "Standard"
+msgstr "Forvalg:"
 
 #: gajim/data/gui/voip_call_received_dialog.ui:15
 msgid "<b><big>Incoming call</big></b>"
-msgstr ""
+msgstr "<b><big>Innkommende samtale</big></b>"
 
 #: gajim/data/gui/add_new_contact_window.ui:29
 msgid "Add New Contact"
-msgstr "Legg til ny Kontakt"
+msgstr "Legg til ny kontakt"
 
 #: gajim/data/gui/add_new_contact_window.ui:62
 msgid "A_ccount:"
-msgstr "_Konto"
+msgstr "_Konto:"
 
 #: gajim/data/gui/add_new_contact_window.ui:110
 msgid "_Protocol:"
@@ -9713,7 +9503,7 @@ msgstr "_Protokoll:"
 
 #: gajim/data/gui/add_new_contact_window.ui:169
 msgid "_User ID:"
-msgstr "_Bruker ID:"
+msgstr "_Bruker-ID:"
 
 #: gajim/data/gui/add_new_contact_window.ui:182
 #: gajim/data/gui/manage_bookmarks_window.ui:133
@@ -9725,39 +9515,35 @@ msgid "_Group:"
 msgstr "_Gruppe:"
 
 #: gajim/data/gui/add_new_contact_window.ui:210
-#, fuzzy
 msgid "Type User ID"
-msgstr "Bruker ID:"
+msgstr "Skriv inn bruker-ID"
 
 #: gajim/data/gui/add_new_contact_window.ui:223
-#, fuzzy
 msgid "Type Nickname"
-msgstr "Kallenavn"
+msgstr "Skriv inn kallenavn"
 
 #: gajim/data/gui/add_new_contact_window.ui:239
 msgid "Choose a group of type a new group"
-msgstr ""
+msgstr "Velg en gruppe eller skriv inn en ny gruppe"
 
 #: gajim/data/gui/add_new_contact_window.ui:257
 msgid "A_llow this contact to view my status"
 msgstr "Ti_llat denne kontakten å se min status"
 
 #: gajim/data/gui/add_new_contact_window.ui:300
-#, fuzzy
 msgid "_Save subscription message"
-msgstr "_Abonnement"
+msgstr "_Lagre abonnementsmelding"
 
 #: gajim/data/gui/add_new_contact_window.ui:325
-#, fuzzy
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
 "protocol. Click on Register button to\n"
 "proceed."
 msgstr ""
-"Du må registrere på denne transporten\n"
+"Du må registrere deg med denne transporten\n"
 "for å kunne legge til en kontakt fra denne\n"
-"protokollen. Klikk på registrer knappen for\n"
+"protokollen. Klikk på \"Registrer\"-knappen for\n"
 "Ã¥ fortsette."
 
 #: gajim/data/gui/add_new_contact_window.ui:340
@@ -9769,17 +9555,16 @@ msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
 msgstr ""
-"Du må være koblet til transporten for å kunne\n"
+"Du må være tilkoblet 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"
+msgstr "Endre statusmelding…"
 
 #: gajim/data/gui/change_mood_dialog.ui:73
 msgid "<b>Mood:</b>"
-msgstr "<b>Stemning:</b>"
+msgstr "<b>Humør:</b>"
 
 #: gajim/data/gui/change_mood_dialog.ui:85
 msgid "<b>Message:</b>"
@@ -9787,92 +9572,84 @@ msgstr "<b>Melding:</b>"
 
 #: gajim/data/gui/plugins_window.ui:25 gajim/data/gui/application_menu.ui:90
 msgid "Plugins"
-msgstr ""
+msgstr "Tillegg"
 
 #: gajim/data/gui/plugins_window.ui:78
 msgid "Install from zip"
-msgstr ""
+msgstr "Installer fra zip-fil"
 
 #: gajim/data/gui/plugins_window.ui:109
 msgid "&lt;empty&gt;"
-msgstr ""
+msgstr "&lt;empty&gt;"
 
 #: gajim/data/gui/plugins_window.ui:131 gajim/data/plugins/config_dialog.ui:199
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:199
-#, fuzzy
 msgid "Version:"
-msgstr "GTK+ Versjon:"
+msgstr "Versjon:"
 
 #: gajim/data/gui/plugins_window.ui:169 gajim/data/plugins/config_dialog.ui:212
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:212
-#, fuzzy
 msgid "Authors:"
-msgstr "Go_dkjenn"
+msgstr "Utviklere:"
 
 #: gajim/data/gui/plugins_window.ui:210 gajim/data/plugins/config_dialog.ui:224
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:224
-#, fuzzy
 msgid "Homepage:"
-msgstr "<b>Hjemmeside:</b>"
+msgstr "Hjemmeside:"
 
 #: gajim/data/gui/plugins_window.ui:253 gajim/data/plugins/config_dialog.ui:236
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:236
-#, fuzzy
 msgid "Description:"
 msgstr "Beskrivelse:"
 
 #: gajim/data/gui/plugins_window.ui:301
 msgid "Uninstall"
-msgstr ""
+msgstr "Avinstaller"
 
 #: gajim/data/gui/plugins_window.ui:316
-#, fuzzy
 msgid "Configure"
-msgstr "_Konfigurer"
+msgstr "_Sett opp"
 
 #: gajim/data/gui/plugins_window.ui:348 gajim/data/plugins/config_dialog.ui:121
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:121
-#, fuzzy
 msgid "Installed"
-msgstr "Henger"
+msgstr "Innstallert"
 
 #: gajim/data/gui/plugins_window.ui:399
 msgid ""
 "Plug-in decription should be displayed here. This text will be erased during "
 "PluginsWindow initialization."
 msgstr ""
+"Tilleggets beskrivelse bør vises her. Denne teksten vil bli slettet under "
+"igangsetting av PluginsWindow."
 
 #: gajim/data/gui/privacy_list_window.ui:18
-#, fuzzy
 msgid "none"
-msgstr "en"
+msgstr "ingen"
 
 #: gajim/data/gui/privacy_list_window.ui:21
-#, fuzzy
 msgid "both"
-msgstr "Begge"
+msgstr "begge"
 
 #: gajim/data/gui/privacy_list_window.ui:24
-#, fuzzy
 msgid "from"
-msgstr "Fra"
+msgstr "fra"
 
 #: gajim/data/gui/privacy_list_window.ui:27
-#, fuzzy
 msgid "to"
-msgstr "to"
+msgstr "til"
 
 #: gajim/data/gui/privacy_list_window.ui:66
 msgid "<i>Privacy List</i>"
-msgstr "<i>Liste over Uønskede</i>"
+msgstr "<i>Personverns-liste</i>"
 
 #: gajim/data/gui/privacy_list_window.ui:77
 msgid "Active for this session"
-msgstr "Aktiv for denne sesjonen"
+msgstr "I bruk for denne økta"
 
 #: gajim/data/gui/privacy_list_window.ui:94
 msgid "Active on each startup"
-msgstr "Aktiv på hver oppstart"
+msgstr "I bruk ved hver oppstart"
 
 #: gajim/data/gui/privacy_list_window.ui:132
 msgid "<b>List of rules</b>"
@@ -9880,11 +9657,11 @@ msgstr "<b>Regelliste</b>"
 
 #: gajim/data/gui/privacy_list_window.ui:244
 msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Legg til / Endre regel</b>"
+msgstr "<b>Legg til / endre regel</b>"
 
 #: gajim/data/gui/privacy_list_window.ui:266
 msgid "Allow"
-msgstr "Tillate"
+msgstr "Tillat"
 
 #: gajim/data/gui/privacy_list_window.ui:282
 msgid "Deny"
@@ -9892,7 +9669,7 @@ msgstr "Nekt"
 
 #: gajim/data/gui/privacy_list_window.ui:317
 msgid "JabberID"
-msgstr "JabberID"
+msgstr "XMPP-ID"
 
 #: gajim/data/gui/privacy_list_window.ui:358
 msgid "all in the group"
@@ -9931,17 +9708,16 @@ msgid "Order:"
 msgstr "Rekkefølge:"
 
 #: gajim/data/gui/manage_sounds_window.ui:10
-#, fuzzy
 msgid "Manage sounds"
-msgstr "Behandle Kontoer"
+msgstr "Behandle lyder"
 
 #: gajim/data/gui/remove_account_window.ui:56
 msgid "Remove account _only from Gajim"
-msgstr "Fjern kontoe _bare fra Gajim"
+msgstr "Fjern kontoen _bare fra Gajim"
 
 #: gajim/data/gui/remove_account_window.ui:73
 msgid "Remove account from Gajim and from _server"
-msgstr "Fjern konto fra Gajim og fra _serveren"
+msgstr "Fjern konto fra Gajim og fra _tjeneren"
 
 #: gajim/data/gui/remove_account_window.ui:94
 msgid "<b>What do you want to do?</b>"
@@ -9949,106 +9725,96 @@ msgstr "<b>Hva ønsker du å gjøre?</b>"
 
 #: gajim/data/gui/adhoc_commands_window.ui:35
 msgid "Please wait while retrieving command list..."
-msgstr "Vennligst vent, henter liste over kommandoer..."
+msgstr "Vent mens listen over kommandoer innhentes…"
 
 #: gajim/data/gui/adhoc_commands_window.ui:93
 msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Velg kommando som skal kjøres:</b>"
+msgstr "<b>Velg kommando å kjøre:</b>"
 
 #: gajim/data/gui/adhoc_commands_window.ui:136
 #: gajim/data/gui/adhoc_commands_window.ui:277
 msgid "Check once more"
-msgstr "Sjekk en gang til"
+msgstr "Sjekk én gang til"
 
 #: gajim/data/gui/adhoc_commands_window.ui:194
-#, fuzzy
 msgid "Please wait while the command is being sent..."
-msgstr "Vennligst vent, sender kommandoer..."
+msgstr "Vent mens kommandoen sendes…"
 
 #: gajim/data/gui/adhoc_commands_window.ui:211
 msgid "Please wait..."
-msgstr "Vennligst vent..."
+msgstr "Vent…"
 
 #: gajim/data/gui/adhoc_commands_window.ui:257
 msgid "This jabber entity does not expose any commands."
-msgstr "Denne jabber enheten eksponerer ikke noen kommandoer."
+msgstr "Denne XMPP-enheten eksponerer ikke noen kommandoer."
 
 #: gajim/data/gui/adhoc_commands_window.ui:336
 msgid "<b>An error has occurred:</b>"
-msgstr "<b>En feil har skjedd:</b>"
+msgstr "<b>En feil har inntruffet:</b>"
 
 #: gajim/data/gui/adhoc_commands_window.ui:465
-#, fuzzy
 msgid "F_inish"
-msgstr "_Avslutt"
+msgstr "A_vslutt"
 
 #: gajim/data/gui/account_context_menu.ui:20
 msgid "_Personal Events"
-msgstr "_Personlige Hendelser"
+msgstr "_Personlige hendelser"
 
 #: gajim/data/gui/account_context_menu.ui:49
 msgid "_Add Contact..."
-msgstr "_Legg til Kontakt..."
+msgstr "_Legg til kontakt…"
 
 #: gajim/data/gui/account_context_menu.ui:57
 msgid "_Discover Services"
-msgstr "_Oppdag Tjenester"
+msgstr "_Oppdag tjenester"
 
 #: gajim/data/gui/account_context_menu.ui:65
 msgid "_Execute Command..."
-msgstr "_Kjør Kommando"
+msgstr "_Kjør kommando…"
 
 #: gajim/data/gui/esession_info_window.ui:50
 msgid "_Verify"
-msgstr "_Verifiser"
+msgstr "_Bekreft"
 
 #: gajim/data/gui/esession_info_window.ui:137
 msgid "(<b>ESession</b> info)"
-msgstr "(<b>ESesjon</b> informasjon)"
+msgstr "(<b>ESesjon</b>s-informasjon)"
 
 #: gajim/data/gui/application_menu.ui:8
-#, fuzzy
 msgid "View"
-msgstr "_Vis"
+msgstr "Vis"
 
 #: gajim/data/gui/application_menu.ui:11
-#, fuzzy
 msgid "Show Roster"
-msgstr "Vis _Kontaktliste"
+msgstr "Vis _kontaktliste"
 
 #: gajim/data/gui/application_menu.ui:16
-#, fuzzy
 msgid "Show Offline Contacts"
-msgstr "Vis _Frakoblede Kontakter"
+msgstr "Vis _frakoblede kontakter"
 
 #: gajim/data/gui/application_menu.ui:21
-#, fuzzy
 msgid "Show Active Contacts"
-msgstr "Vis Bare _Aktive Kontakter"
+msgstr "Vis aktive kontakter"
 
 #: gajim/data/gui/application_menu.ui:26
-#, fuzzy
 msgid "Show Transports"
-msgstr "Vis Trans_porter"
+msgstr "Vis transporter"
 
 #: gajim/data/gui/application_menu.ui:43
-#, fuzzy
 msgid "Help"
-msgstr "_Hjelp"
+msgstr "Hjelp"
 
 #: gajim/data/gui/application_menu.ui:46
-#, fuzzy
 msgid "Contents"
-msgstr "_Innhold"
+msgstr "Innhold"
 
 #: gajim/data/gui/application_menu.ui:50
-#, fuzzy
 msgid "FAQ"
-msgstr "_FAQ"
+msgstr "O-S-S"
 
 #: gajim/data/gui/application_menu.ui:54
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "Tastatursnarveier"
 
 #: gajim/data/gui/application_menu.ui:58 gajim/data/gui/features_window.ui:9
 msgid "Features"
@@ -10056,17 +9822,15 @@ msgstr "Funksjonalitet"
 
 #: gajim/data/gui/application_menu.ui:76
 msgid "Start Chat"
-msgstr "Start Samtale"
+msgstr "Start samtale"
 
 #: gajim/data/gui/application_menu.ui:81
-#, fuzzy
 msgid "Bookmarks"
-msgstr "_Bokmerke"
+msgstr "Bokmerker"
 
 #: gajim/data/gui/application_menu.ui:99
-#, fuzzy
 msgid "Quit"
-msgstr "_Avslutt"
+msgstr "Avslutt"
 
 #: gajim/data/gui/features_window.ui:26
 msgid "<b>List of possible features in Gajim:</b>"
@@ -10074,49 +9838,43 @@ msgstr "<b>Liste over muligheter i Gajim:</b>"
 
 #: gajim/data/gui/manage_bookmarks_window.ui:14
 msgid "Manage Bookmarks"
-msgstr "Behandle Bokmerker"
+msgstr "Behandle bokmerker"
 
 #: gajim/data/gui/manage_bookmarks_window.ui:120
-#, fuzzy
 msgid "_Title:"
-msgstr "Tittel:"
+msgstr "_Tittel:"
 
 #: gajim/data/gui/manage_bookmarks_window.ui:146
 msgid "Roo_m:"
-msgstr ""
+msgstr "Ro_m:"
 
 #: gajim/data/gui/manage_bookmarks_window.ui:188
-#, fuzzy
 msgid "A_uto join"
-msgstr "Auto bli med"
+msgstr "A_utomatisk deltagelse"
 
 #: gajim/data/gui/manage_bookmarks_window.ui:193
 msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Dersom valgt vil Gajim automatisk gå inn i gruppesamtalen ved oppstart"
+msgstr "Dersom valgt vil Gajim automatisk ta del i gruppesamtalen ved oppstart"
 
 #: gajim/data/gui/manage_bookmarks_window.ui:207
-#, fuzzy
 msgid "Minimi_ze on Auto Join"
-msgstr "Minimer ved Automatisk Deltakelse"
+msgstr "Mini_mer ved automatisk deltakelse"
 
 #: gajim/data/gui/manage_bookmarks_window.ui:235
-#, fuzzy
 msgid "Pr_int status:"
-msgstr "Skriv status:"
+msgstr "Utskr_iftsstatus:"
 
 #: gajim/data/gui/exception_dialog.ui:45
-#, fuzzy
 msgid ""
 "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."
+"En programmeringsfeil har blitt oppdaget. Det er sannsynligvis ikke kritisk, "
+"men bør rapporteres til utviklerne likevel."
 
 #: gajim/data/gui/exception_dialog.ui:115
-#, fuzzy
 msgid "Report Bug"
-msgstr "_Rapporter Feil"
+msgstr "Rapporter feil"
 
 #: gajim/data/gui/subscription_request_window.ui:95
 msgid "_Deny"
@@ -10127,7 +9885,7 @@ msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr ""
-"Avslå godkjenning fra kontakt så han eller henne ikke kan se når du er "
+"Avslå godkjenning fra kontakt slik at vedkommende ikke kan se når du er "
 "tilkoblet"
 
 #: gajim/data/gui/subscription_request_window.ui:133
@@ -10136,64 +9894,60 @@ msgstr "Go_dkjenn"
 
 #: 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"
+msgstr "Godkjenn kontakt slik at vedkommende kan vite når du er tilkoblet"
 
 #: gajim/data/gui/xml_console_window.ui:121
-#, fuzzy
 msgid "Presence"
-msgstr "_Tilstedeværelse"
+msgstr "Tilstedeværelse"
 
 #: gajim/data/gui/xml_console_window.ui:134
 msgid "Iq"
 msgstr ""
 
 #: gajim/data/gui/xml_console_window.ui:149
-#, fuzzy
 msgid "Presets"
-msgstr "_Tilstedeværelse"
+msgstr "Forvalg"
 
 #: gajim/data/gui/chat_to_muc_window.ui:24
 msgid "Invite Friends!"
-msgstr "Inviter Venner!"
+msgstr "Inviter venner!"
 
 #: 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 ""
-"Du kommer nå til å starte en Fler-Bruker Samtale.\n"
+"Du tar nå del i en gruppesludring.\n"
 "Velg kontaktene du ønsker å invitere"
 
 #: gajim/data/gui/chat_to_muc_window.ui:67
 #: gajim/data/gui/chat_to_muc_window.ui:78
 msgid "column"
-msgstr ""
+msgstr "kolonne"
 
 #: gajim/data/gui/chat_to_muc_window.ui:112
 msgid "Please select a MUC server."
-msgstr "Vennligst velg en MUC server."
+msgstr "Velg en MUC-tjener."
 
 #: gajim/data/gui/chat_to_muc_window.ui:141
 msgid "MUC server"
-msgstr "MUC server"
+msgstr "MUC-tjener"
 
 #: gajim/data/gui/chat_to_muc_window.ui:176
 msgid "In_vite"
 msgstr "In_viter"
 
 #: gajim/data/gui/history_manager.ui:11
-#, fuzzy
 msgid "_Export"
-msgstr "Eksport"
+msgstr "_Eksporter"
 
 #: gajim/data/gui/history_manager.ui:94
 msgid "Gajim History Logs Manager"
-msgstr "Gajim Historske Logg Behandler"
+msgstr "Behandling av logghistorikk i Gajim"
 
 #: gajim/data/gui/history_manager.ui:147
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
-msgstr "<big><b>Velkommen til Gajims Historikk og Logg Behandler</b></big>"
+msgstr "<big><b>Velkommen til Gajims behandling av løggføring</b></big>"
 
 #: gajim/data/gui/history_manager.ui:183
 msgid ""
@@ -10203,11 +9957,11 @@ msgid ""
 "Use this program to delete or export logs. You can select logs from the left "
 "and/or search database from below."
 msgstr ""
-"Denne logg behandleren er ikke ment for logg visning. Dersom du ser etter "
-"slik funksjonalitet så må du bruke historikk vinduet isteden.\n"
+"Denne logg-behandleren er ikke ment for logg-visning. Dersom du er på utkikk "
+"etter slik funksjonalitet må du bruke historikk-vinduet.\n"
 "\n"
 "Bruk dette programmet til å slette eller eksportere logger. Du kan velge "
-"logger fra venstre og/eller søke databasen under."
+"logger fra venstre og/eller søke i databasen nedenfor."
 
 #: gajim/data/gui/history_manager.ui:228
 msgid ""
@@ -10216,181 +9970,164 @@ msgid ""
 "Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<b>ADVARSEL:</b>\n"
-"Dersom du planlegger å gjøre store slette operasjoner, pass på at Gajim ikke "
-"kjører. Generelt bør man unngå å slette fra kontakter du er i samtale med."
+"Dersom du planlegger å slette mye, pass på at Gajim ikke kjører. Generelt "
+"bør man unngå å slette fra kontakter du er i samtale med."
 
 #: gajim/data/gui/history_manager.ui:335
 msgid "_Search Database"
-msgstr "_Søk Databasen"
+msgstr "_Søk i databasen"
 
 #: gajim/data/gui/shortcuts_window.ui:8
 msgid "Chat Shortcuts"
-msgstr ""
+msgstr "Sludresnarveier"
 
 #: gajim/data/gui/shortcuts_window.ui:12
-#, fuzzy
 msgid "Message composition"
-msgstr "Meldings innhold"
+msgstr "Meldingsforfatting"
 
 #: gajim/data/gui/shortcuts_window.ui:17
-#, fuzzy
 msgid "Send the message"
-msgstr "Send melding"
+msgstr "Send meldingen"
 
 #: gajim/data/gui/shortcuts_window.ui:24
-#, fuzzy
 msgid "Create a new line"
-msgstr "Lag en ny post"
+msgstr "Legg til ny linje"
 
 #: gajim/data/gui/shortcuts_window.ui:31
-#, fuzzy
 msgid "Select an emoticon"
-msgstr "Bruk _uttrykksikoner"
+msgstr "Velg et humørfjes"
 
 #: gajim/data/gui/shortcuts_window.ui:38
 msgid "Complete a command or a nick"
-msgstr ""
+msgstr "Fullfør en kommando eller et kallenavn"
 
 #: gajim/data/gui/shortcuts_window.ui:45
-#, fuzzy
 msgid "Previous sent message"
-msgstr "Forvalgte meldinger:"
+msgstr "Tidligere sendt melding"
 
 #: gajim/data/gui/shortcuts_window.ui:52
-#, fuzzy
 msgid "Next sent messages"
-msgstr "Forvalgte meldinger:"
+msgstr "Neste sendte meldinger:"
 
 #: gajim/data/gui/shortcuts_window.ui:59
-#, fuzzy
 msgid "Quote previous message"
-msgstr "Eller velg en forhåndsvalgt melding:"
+msgstr "Siter forrige melding"
 
 #: gajim/data/gui/shortcuts_window.ui:66
-#, fuzzy
 msgid "Quote next message"
-msgstr "Send melding"
+msgstr "Siter neste melding"
 
 #: gajim/data/gui/shortcuts_window.ui:73
-#, fuzzy
 msgid "Clear message entry"
-msgstr "Melding Sendt"
+msgstr "Tøm meldingsoppføring"
 
 #: gajim/data/gui/shortcuts_window.ui:81 gajim/data/gui/shortcuts_window.ui:231
-#, fuzzy
 msgid "Appearance"
-msgstr "<b>Samtale Utseende</b>"
+msgstr "Utseende"
 
 #: gajim/data/gui/shortcuts_window.ui:86
 msgid "Toggle full / compact view"
-msgstr ""
+msgstr "Veksle full / kompakt visning"
 
 #: gajim/data/gui/shortcuts_window.ui:94
-#, fuzzy
 msgid "Recent history"
-msgstr "Nylig:"
+msgstr "Nylig historikk"
 
 #: gajim/data/gui/shortcuts_window.ui:99
 msgid "Scroll up"
-msgstr ""
+msgstr "Rull oppover"
 
 #: gajim/data/gui/shortcuts_window.ui:106
 msgid "Scroll down"
-msgstr ""
+msgstr "Rull nedover"
 
 #: gajim/data/gui/shortcuts_window.ui:121
 msgid "Tabs"
-msgstr ""
+msgstr "Faner"
 
 #: gajim/data/gui/shortcuts_window.ui:126
 msgid "Switch to the previous tab"
-msgstr ""
+msgstr "Bytt til forrige fane"
 
 #: gajim/data/gui/shortcuts_window.ui:133
 msgid "Switch to the next tab"
-msgstr ""
+msgstr "Bytt til neste fane"
 
 #: gajim/data/gui/shortcuts_window.ui:140
 msgid "Switch to the first - ninth tab"
-msgstr ""
+msgstr "Bytt til første - niende fane"
 
 #: gajim/data/gui/shortcuts_window.ui:147
 msgid "Switch to the previous unread tab"
-msgstr ""
+msgstr "Bytt til forrige uleste fane"
 
 #: gajim/data/gui/shortcuts_window.ui:154
 msgid "Switch to the next unread tab"
-msgstr ""
+msgstr "Bytt til neste uleste fane"
 
 #: gajim/data/gui/shortcuts_window.ui:161
 msgid "Close chat"
-msgstr ""
+msgstr "Lukk sludring"
 
 #: gajim/data/gui/shortcuts_window.ui:172
 msgid "Roster Shortcuts"
-msgstr ""
+msgstr "Kontaktlistesnarveier"
 
 #: gajim/data/gui/shortcuts_window.ui:195
-#, fuzzy
 msgid "File transfers"
-msgstr "Fil Overføringer"
+msgstr "Filoverføringer"
 
 #: gajim/data/gui/shortcuts_window.ui:202
-#, fuzzy
 msgid "Start a new chat"
-msgstr "Start Samtale"
+msgstr "Start ny samtale"
 
 #: gajim/data/gui/shortcuts_window.ui:209
-#, fuzzy
 msgid "Join a group chat"
-msgstr "i _gruppe samtale"
+msgstr "Ta del i gruppesamtale"
 
 #: gajim/data/gui/shortcuts_window.ui:216
-#, fuzzy
 msgid "Set the status message"
-msgstr "status melding"
+msgstr "Sett statusmelding"
 
 #: gajim/data/gui/shortcuts_window.ui:223
-#, fuzzy
 msgid "Quit Gajim"
-msgstr "Gajim"
+msgstr "Avslutt Gajim"
 
 #: gajim/data/gui/shortcuts_window.ui:236
-#, fuzzy
 msgid "Show offline contacts"
-msgstr "Vis _Frakoblede Kontakter"
+msgstr "Vis _frakoblede kontakter"
 
 #: gajim/data/gui/shortcuts_window.ui:243
-#, fuzzy
 msgid "Show only active contacts"
-msgstr "Vis Bare _Aktive Kontakter"
+msgstr "Kun vis aktive kontakter"
 
 #: gajim/data/gui/shortcuts_window.ui:250
 msgid "Enable roster filtering"
-msgstr ""
+msgstr "Skru på kontaktlistefiltrering"
 
 #: gajim/data/gui/shortcuts_window.ui:258
 msgid "Contacts"
 msgstr "Kontakter"
 
 #: gajim/data/gui/shortcuts_window.ui:263
-#, fuzzy
 msgid "Contact information"
 msgstr "Kontaktinformasjon"
 
 #: gajim/data/gui/shortcuts_window.ui:270
-#, fuzzy
 msgid "Rename contact"
-msgstr "Omdøpe Kontakt"
+msgstr "Gi kontakt nytt navn"
 
 #: gajim/data/gui/shortcuts_window.ui:277
-#, fuzzy
 msgid "Delete contact"
-msgstr "Sendt kontakter:"
+msgstr "Slett kontakt"
 
 #: gajim/data/gui/passphrase_dialog.ui:8
 msgid "Passphrase"
-msgstr "Passord setning"
+msgstr "Passordssetning"
+
+#: gajim/data/gui/history_window.ui:38
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Skriv inn navnet / JID-en tilhørende kontakt eller gruppesludring"
 
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
@@ -10398,24 +10135,23 @@ msgstr "Søk:"
 
 #: gajim/data/gui/history_window.ui:75
 msgid "_In date search"
-msgstr ""
+msgstr "_Søk innenfor dato"
 
 #: gajim/data/gui/history_window.ui:79
 msgid "Only searching within selected day"
-msgstr ""
+msgstr "Søker kun innen valgt dag"
 
-#: gajim/data/gui/history_window.ui:213
-#, fuzzy
+#: gajim/data/gui/history_window.ui:306
 msgid "_Show status changes"
-msgstr "_Logg status endringer til kontakter"
+msgstr "_Vis statusendringer"
 
 #: gajim/data/gui/manage_pep_services_window.ui:13
 msgid "PEP Service Configuration"
-msgstr "PEP Service Konfigurasjon"
+msgstr "PEP-tjenesteoppsett"
 
 #: gajim/data/gui/manage_pep_services_window.ui:69
 msgid "_Configure"
-msgstr "_Konfigurer"
+msgstr "_Sett opp"
 
 #: gajim/data/gui/groups_post_window.ui:9
 msgid "Create new post"
@@ -10437,11 +10173,11 @@ msgstr "Fyll inn skjemaet."
 
 #: gajim/data/gui/data_form_window.ui:274
 msgid "Room Configuration"
-msgstr "Rom Instillinger"
+msgstr "Rom-innstillinger"
 
 #: gajim/data/gui/roster_item_exchange_window.ui:8
 msgid "Roster Item Exchange"
-msgstr "Kontaktliste Element Utveksling"
+msgstr "Utveksling av kontaktlisteelement"
 
 #: gajim/data/gui/systray_context_menu.ui:12
 msgid "Sta_tus"
@@ -10449,23 +10185,21 @@ msgstr "Sta_tus"
 
 #: gajim/data/gui/systray_context_menu.ui:20
 msgid "_Start Chat..."
-msgstr "_Start Samtale..."
+msgstr "_Start samtale…"
 
 #: gajim/data/gui/systray_context_menu.ui:50
 msgid "Show All Pending _Events"
-msgstr "Vis Alle _Handlinger som Venter"
+msgstr "Vis alle _handlinger på vent"
 
 #: gajim/data/gui/systray_context_menu.ui:59
 msgid "Mute Sounds"
-msgstr "Slå av Lyder"
+msgstr "Slå av lyder"
 
 #: gajim/data/gui/systray_context_menu.ui:75
-#, fuzzy
 msgid "_Preferences"
-msgstr "Tilstedeværelse"
+msgstr "_Innstillinger"
 
 #: gajim/data/gui/systray_context_menu.ui:90
-#, fuzzy
 msgid "_Quit"
 msgstr "_Avslutt"
 
@@ -10495,15 +10229,15 @@ msgstr "Svar på denne meldingen"
 
 #: gajim/data/gui/single_message_window.ui:248
 msgid "_Send & Close"
-msgstr "_Send & Lukk"
+msgstr "_Send og lukk"
 
 #: gajim/data/gui/single_message_window.ui:254
 msgid "Send message and close window"
-msgstr "Send melding og lukk vinduet"
+msgstr "Send melding for så å lukke vinduet"
 
 #: gajim/data/gui/change_activity_dialog.ui:8
 msgid "Set Activity"
-msgstr "Sett Aktivitet"
+msgstr "Sett aktivitet"
 
 #: gajim/data/gui/change_activity_dialog.ui:65
 msgid "Set an activity"
@@ -10511,18 +10245,18 @@ msgstr "Sett en aktivitet"
 
 #: gajim/data/gui/change_activity_dialog.ui:337
 msgid "<b>Message:</b> "
-msgstr "<b>Melding:</b>"
+msgstr "<b>Melding:</b> "
 
 #: gajim/data/plugins/config_dialog.ui:17
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:17
 msgid "Check update after start"
-msgstr ""
+msgstr "Oppdateringssjekk etter start"
 
 #: gajim/data/plugins/config_dialog.ui:103
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:103
 #: gajim/plugins/gui.py:84
 msgid "Plugin"
-msgstr ""
+msgstr "Programtillegg"
 
 #: gajim/data/plugins/config_dialog.ui:132
 #: gajim/data/plugins/plugin_installer.py:203
@@ -10531,34 +10265,32 @@ msgstr ""
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:203
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:233
 #: gajim/command_system/implementation/standard.py:152
-#, fuzzy
 msgid "Available"
-msgstr "_Tilgjengelig"
+msgstr "Tilgjengelig"
 
 #: gajim/data/plugins/config_dialog.ui:143
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:143
-#, fuzzy
 msgid ""
 "Install /\n"
 "Upgrade"
-msgstr "Henger"
+msgstr ""
+"Installer /\n"
+"Oppgrader"
 
 #: gajim/data/plugins/config_dialog.ui:298
 #: gajim/data/plugins/plugin_installer/config_dialog.ui:298
-#, fuzzy
 msgid "Install/Upgrade"
-msgstr "Henger"
+msgstr "Installer/oppgrader"
 
 #: gajim/data/plugins/plugin_installer.py:114
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:114
 msgid "Install and Upgrade Plugins"
-msgstr ""
+msgstr "Installer og oppgrader programtillegg"
 
 #: gajim/data/plugins/plugin_installer.py:138
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:138
-#, fuzzy
 msgid "Plugins updates"
-msgstr "Registrering feilet"
+msgstr "Programtilleggsoppgraderinger"
 
 #: gajim/data/plugins/plugin_installer.py:139
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:139
@@ -10568,11 +10300,14 @@ msgid ""
 "those plugins:\n"
 "%s"
 msgstr ""
+"Noen oppgraderinger er tilgjengelige for dine installasjonsprogramtillegg. "
+"Ønsker du å oppgradere de programtilleggene:\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 "Sikkerhetsfeil under nedlasting"
 
 #: gajim/data/plugins/plugin_installer.py:252
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:252
@@ -10582,11 +10317,16 @@ msgid ""
 "\n"
 "You can continue at your risk. Do you want to do so? (not recommended)"
 msgstr ""
+"En sikkerhetsfeil inntraff under nedlasting. Sertifikatet tilhørende "
+"programtilleggsarkivet kunne ikke bekreftes. Dette kan være et "
+"sikkerhetsangrep. \n"
+"\n"
+"Du kan fortsette på egen risiko. Ønsker du å gjøre det (ikke anbefalt)"
 
 #: gajim/data/plugins/plugin_installer.py:268
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:268
 msgid "Error in download"
-msgstr ""
+msgstr "Feil i nedlastning"
 
 #: gajim/data/plugins/plugin_installer.py:269
 #: gajim/data/plugins/plugin_installer/plugin_installer.py:269
@@ -10596,57 +10336,59 @@ msgid ""
 "\n"
 "<tt>[%s]</tt>"
 msgstr ""
+"En feil inntraff under nedlasting\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 "Alle valgte programtillegg har blitt lastet ned"
 
 #: gajim/command_system/mapping.py:164 gajim/command_system/mapping.py:174
 #: gajim/command_system/mapping.py:194
-#, fuzzy
 msgid "Missing arguments"
-msgstr "Mangler argument \"contact_jid\""
+msgstr "Manglende argumenter"
 
 #: gajim/command_system/mapping.py:261
-#, fuzzy
 msgid "Too many arguments"
-msgstr "Mangler argument \"contact_jid\""
+msgstr "For mange argumenter"
 
 #: gajim/command_system/implementation/execute.py:53
 msgid "Execute expression inside a shell, show output"
-msgstr ""
+msgstr "Kjør uttrykk i et skall, vis utdata"
 
 #: gajim/command_system/implementation/execute.py:109
 msgid "Execute expression inside a shell, send output"
-msgstr ""
+msgstr "Kjør uttrykk i et skall, send utdata"
 
 #: gajim/command_system/implementation/standard.py:45
 msgid ""
 "Show help on a given command or a list of available commands if -a is given"
 msgstr ""
+"Viser hjelp for en gitt kommando eller en liste over tilgjengelige "
+"kommandoer hvis -a blir lagt til"
 
 #: gajim/command_system/implementation/standard.py:72
-#, fuzzy
 msgid "Send a message to the contact"
-msgstr "Bruk: /%s, sender meldingen til kontakten"
+msgstr "Send en melding til kontakten"
 
 #: gajim/command_system/implementation/standard.py:77
 msgid "Send action (in the third person) to the current chat"
-msgstr ""
+msgstr "Send handling (i tredjeperson) til gjeldende samtale"
 
 #: gajim/command_system/implementation/standard.py:82
 msgid "Show logged messages which mention given text"
-msgstr ""
+msgstr "Vis loggførte meldinger som siterer angitt tekst"
 
 #: gajim/command_system/implementation/standard.py:87
-#, fuzzy, python-format
+#, python-format
 msgid "%s: Nothing found"
-msgstr "%s ikke funnet"
+msgstr "%s: Fant ikke noe"
 
 #: gajim/command_system/implementation/standard.py:93
 msgid "Limit must be an integer"
-msgstr ""
+msgstr "Avgrensningen må være et heltall"
 
 #: gajim/command_system/implementation/standard.py:117
 msgid ""
@@ -10657,121 +10399,114 @@ msgid ""
 "    online, away, chat, xa, dnd.\n"
 "    "
 msgstr ""
+"\n"
+"    Sett gjeldende status\n"
+"\n"
+"    Status kan oppgis som én av følgende verdier:\n"
+"    'PÃ¥logget', 'Borte', 'Prater', 'Ikke tilgjengelig', Ikke forstyrr'.\n"
+"    "
 
 #: gajim/command_system/implementation/standard.py:135
 msgid "Set the current status to away"
-msgstr ""
+msgstr "Sett gjeldende status til 'Borte'"
 
 #: gajim/command_system/implementation/standard.py:149
 msgid "Set the current status to online"
-msgstr ""
+msgstr "Sett gjeldende status til 'PÃ¥logget'"
 
 #: gajim/command_system/implementation/standard.py:172
 #: gajim/command_system/implementation/standard.py:249
-#, fuzzy
 msgid "Clear the text window"
-msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
+msgstr "Tøm tekstvinduet"
 
 #: gajim/command_system/implementation/standard.py:177
 #: gajim/command_system/implementation/standard.py:389
-#, fuzzy
 msgid "Send a ping to the contact"
-msgstr "Bruk: /%s, sender en ping til kontakten"
+msgstr "Send et ping til kontakten"
 
 #: gajim/command_system/implementation/standard.py:180
 #: gajim/command_system/implementation/standard.py:392
-#, fuzzy
 msgid "Command is not supported for zeroconf accounts"
-msgstr "Kommando ikke støttet for zeroconf konto."
+msgstr "Kommando støttes ikke for zeroconf-kontoer"
 
 #: gajim/command_system/implementation/standard.py:184
 msgid "Send DTMF sequence through an open audio session"
-msgstr ""
+msgstr "Send DTMF-sekvens gjennom en åpen lydøkt"
 
 #: gajim/command_system/implementation/standard.py:187
-#, fuzzy
 msgid "No open audio sessions with the contact"
-msgstr "Klikk for å se tidligere samtaler med denne kontakten"
+msgstr "Ingen åpne lydsamtaler med denne kontakten"
 
 #: gajim/command_system/implementation/standard.py:190
-#, fuzzy, python-format
+#, python-format
 msgid "%s is not a valid tone"
-msgstr "%s er ikke et gyldig loggnivå"
+msgstr "%s er ikke en gyldig tone"
 
 #: gajim/command_system/implementation/standard.py:197
 msgid "Toggle audio session"
-msgstr ""
+msgstr "Veksle lydøkt"
 
 #: gajim/command_system/implementation/standard.py:200
-#, fuzzy
 msgid "Audio sessions are not available"
-msgstr "Tilkobling ikke tilgjengelig"
+msgstr "Lydøkter er ikke tilgjengelige"
 
 #: gajim/command_system/implementation/standard.py:207
 msgid "Toggle video session"
-msgstr ""
+msgstr "Veksle videoøkt"
 
 #: gajim/command_system/implementation/standard.py:210
-#, fuzzy
 msgid "Video sessions are not available"
-msgstr "Tilkobling ikke tilgjengelig"
+msgstr "Videoøkter er ikke tilgjengelige"
 
 #: gajim/command_system/implementation/standard.py:217
 msgid "Send a message to the contact that will attract his (her) attention"
-msgstr ""
+msgstr "Send en melding til kontakten som påkaller vedkommendes oppmerksomhet"
 
 #: gajim/command_system/implementation/standard.py:256
-#, fuzzy
 msgid "Change your nickname in a group chat"
-msgstr "Endre ditt _Kallenavn (Ctrl+N)"
+msgstr "Endre kallenavnet ditt i en gruppesamtale"
 
 #: gajim/command_system/implementation/standard.py:266
-#, fuzzy
 msgid "Open a private chat window with a specified occupant"
-msgstr ""
-"Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
-"spesifiserte brukeren."
+msgstr "Ã…pne privat samtalevindu med gitt deltager"
 
 #: gajim/command_system/implementation/standard.py:272
 #: gajim/command_system/implementation/standard.py:281
 #: gajim/command_system/implementation/standard.py:327
 #: gajim/command_system/implementation/standard.py:339
 #: gajim/command_system/implementation/standard.py:351
-#, fuzzy
 msgid "Nickname not found"
-msgstr "Kallenavn ikke funnet: %s"
+msgstr "Fant ikke kallenavnet"
 
 #: gajim/command_system/implementation/standard.py:275
-#, fuzzy
 msgid ""
 "Open a private chat window with a specified occupant and send him a message"
 msgstr ""
-"Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
-"spesifiserte brukeren."
+"Ã…pne privat samtalevindu med en gitt deltager og send vedkommende en melding"
 
 #: gajim/command_system/implementation/standard.py:284
-#, fuzzy
 msgid "Display or change a group chat topic"
-msgstr "Spør før lukking av gruppesamtale fane/vindu."
+msgstr "Vis eller endre gruppens samtaletema"
 
 #: gajim/command_system/implementation/standard.py:292
 msgid "Invite a user to a room for a reason"
-msgstr ""
+msgstr "Inviter en bruker til et rom av en grunn"
 
 #: gajim/command_system/implementation/standard.py:295
-#, fuzzy, python-format
+#, python-format
 msgid "Invited %(jid)s to %(room_jid)s"
-msgstr "Invitert %(contact_jid)s til %(room_jid)s."
+msgstr "Inviterte %(jid)s til %(room_jid)s"
 
 #: gajim/command_system/implementation/standard.py:299
-#, fuzzy
 msgid "Join a group chat given by a jid"
-msgstr "i _gruppe samtale"
+msgstr "Ta del i gruppesludring gitt av JID"
 
 #: gajim/command_system/implementation/standard.py:307
 msgid ""
 "Leave the groupchat, optionally giving a reason, and close tab or window"
 msgstr ""
+"Forlat gruppesamtalen, alternativt ved å oppgi en grunn, og lukk fanen eller "
+"vinduet"
 
 #: gajim/command_system/implementation/standard.py:312
 msgid ""
@@ -10781,11 +10516,15 @@ msgid ""
 "    If given nickname is not found it will be treated as a jid.\n"
 "    "
 msgstr ""
+"\n"
+"    Bannlys en bruker fra gruppesamtale etter kallenavn eller JID\n"
+"\n"
+"    Hvis oppgitt kallenavn finnes vil det bli behandlet som en JID.\n"
+"    "
 
 #: gajim/command_system/implementation/standard.py:324
-#, fuzzy
 msgid "Kick user by a nick from a groupchat"
-msgstr "Du er invitert til en gruppesamtale"
+msgstr "Kast ut bruker fra gruppesamtale etter kallenavn"
 
 #: gajim/command_system/implementation/standard.py:332
 msgid ""
@@ -10793,11 +10532,13 @@ msgid ""
 "    Role can be given as one of the following values:\n"
 "    moderator, participant, visitor, none"
 msgstr ""
+"Sett deltagerrolle i gruppesamtale.\n"
+"    Rolle kan være en av følgende verdier:\n"
+"    'moderator','deltager','besøkende' eller 'ingen'"
 
 #: gajim/command_system/implementation/standard.py:337
-#, fuzzy
 msgid "Invalid role given"
-msgstr "Ugyldig server"
+msgstr "Ugyldig rolle oppgitt"
 
 #: gajim/command_system/implementation/standard.py:344
 msgid ""
@@ -10805,88 +10546,85 @@ msgid ""
 "    Affiliation can be given as one of the following values:\n"
 "    owner, admin, member, outcast, none"
 msgstr ""
+"Sett deltager-tilhøriget i gruppesamtale.\n"
+"    Tilhørighet kan oppgis som én av følgende verdier:\n"
+"    'eier', 'admin', 'medlem', 'einstøing', 'ingen'"
 
 #: gajim/command_system/implementation/standard.py:349
-#, fuzzy
 msgid "Invalid affiliation given"
-msgstr "tilhørighet endret"
+msgstr "Ugyldig tilhørighet angitt"
 
 #: gajim/command_system/implementation/standard.py:357
-#, fuzzy
 msgid "Display names of all group chat occupants"
-msgstr "Bruksanvisning: /%s , viser navnene til deltakere i samtalerommet."
+msgstr "Vis navnene til hele gruppens samtaledeltagere"
 
 #: gajim/command_system/implementation/standard.py:379
 msgid "Forbid an occupant to send you public or private messages"
-msgstr ""
+msgstr "Forby en deltager fra å sende deg offentlige eller private meldinger"
 
 #: gajim/command_system/implementation/standard.py:384
 msgid "Allow an occupant to send you public or private messages"
-msgstr ""
+msgstr "Tillat en deltager å sende deg offentlige eller private meldinger"
 
 #: gajim/command_system/implementation/middleware.py:72
 msgid "Error during command execution!"
-msgstr ""
+msgstr "Feil under kjøring av kommando!"
 
 #: gajim/command_system/implementation/custom.py:106
 msgid "The same as using a doc-string, except it supports translation"
 msgstr ""
+"Det samme som å bruke en doc-streng, bortsett fra at det støtter oversetting"
 
 #: gajim/plugins/pluginmanager.py:611 gajim/plugins/pluginmanager.py:617
 msgid "Archive corrupted"
-msgstr ""
+msgstr "Arkiv skadet"
 
 #: gajim/plugins/pluginmanager.py:613
-#, fuzzy
 msgid "Archive empty"
-msgstr "Filen er tom"
+msgstr "Arkiv tomt"
 
 #: gajim/plugins/pluginmanager.py:625 gajim/plugins/pluginmanager.py:633
 #: gajim/plugins/gui.py:264
-#, fuzzy
 msgid "Archive is malformed"
-msgstr "Tjenesten sendte ødelagte data"
+msgstr "Arkivet er skadet"
 
 #: gajim/plugins/pluginmanager.py:641 gajim/plugins/gui.py:288
 #: gajim/plugins/gui.py:296
-#, fuzzy
 msgid "Plugin already exists"
-msgstr "Denne filen finnes fra før"
+msgstr "Programtillegget finnes allerede"
 
 #: gajim/plugins/gui.py:156
-#, fuzzy, python-format
+#, python-format
 msgid "Warning: %s"
-msgstr "Utvise %s"
+msgstr "Advarsel: %s"
 
 #: gajim/plugins/gui.py:213
-#, fuzzy
 msgid "Plugin failed"
-msgstr "Registrering feilet"
+msgstr "Programtillegg kræsjet"
 
 #: gajim/plugins/gui.py:256
 msgid "Unable to properly remove the plugin"
-msgstr ""
+msgstr "Fikk ikke til å fjerne programtillegget på rett måte"
 
 #: gajim/plugins/gui.py:288
 msgid "Overwrite?"
-msgstr ""
+msgstr "Overskriv?"
 
 #: gajim/plugins/gui.py:320
-#, fuzzy
 msgid "Configuration"
-msgstr "Rom Instillinger"
+msgstr "Oppsett"
 
 #: data/org.gajim.Gajim.desktop.in:5
 msgid "Jabber IM Client"
-msgstr "Jabber IM Klient"
+msgstr "XMPP-lynmeldingsklient"
 
 #: data/org.gajim.Gajim.desktop.in:6 data/org.gajim.Gajim.appdata.xml.in:10
 msgid "A GTK+ Jabber client"
-msgstr "En GTK+ Jabber klient"
+msgstr "En GTK+ -XMPP-klient"
 
 #: data/org.gajim.Gajim.desktop.in:8
 msgid "chat;messaging;im;xmpp;bonjour;voip;"
-msgstr ""
+msgstr "sludring;meldingsforsendelse;lynmeldinger;xmpp;bonjour;voip;"
 
 #: data/org.gajim.Gajim.desktop.in:12
 msgid "org.gajim.Gajim"
@@ -10898,106 +10636,111 @@ msgid ""
 "Nimbuzz, Ovi, Talkonaut, and thousands of other services run by companies "
 "and ISPs, and volunteers around the world."
 msgstr ""
+"Gajim er en sludreklient for bruk med Jabber.org, Live Journal Talk, "
+"Nimbuzz, Ovi, Talkonaut og tusenvis av andre tjenester drevet av selskaper "
+"og internettilbydere og frivillige verden over."
 
 #: 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 ""
+"Hvis du har forskjellige kontoer på forskjellige tjenere, eller ønsker "
+"kontakt med venner og familie, er Gajim for deg."
 
 #: data/org.gajim.Gajim.appdata.xml.in:19
-#, fuzzy
 msgid "Features:"
-msgstr "Funksjonalitet"
+msgstr "Funksjonalitet:"
 
 #: data/org.gajim.Gajim.appdata.xml.in:21
 msgid "Tabbed chat window and single window modes"
-msgstr ""
+msgstr "Fanebaserte sludrevindu og enkeltvindusmodus"
 
 #: data/org.gajim.Gajim.appdata.xml.in:22
 msgid ""
 "Group chat support (with Multi-User Chat protocol), invitation, chat to "
 "group chat transformation"
 msgstr ""
+"Gruppesludringsstøtte (med flerbrukersludrings-protokoll), invitasjon, "
+"sludring til gruppesludringstransformasjon"
 
 #: data/org.gajim.Gajim.appdata.xml.in:23
 msgid "Emoticons, avatars, PEP (user activity, mood and tune)"
-msgstr ""
+msgstr "Smilefjes, avatarer, PEP (brukeraktivitet, humør og sang)"
 
 #: data/org.gajim.Gajim.appdata.xml.in:24
 msgid "Audio / video conferences"
-msgstr ""
+msgstr "Lyd- /video-konferanser"
 
 #: data/org.gajim.Gajim.appdata.xml.in:25
-#, fuzzy
 msgid "File transfer, room bookmarks"
-msgstr "Fil Overføring Feilet"
+msgstr "Filoverføring, rombokmerker"
 
 #: data/org.gajim.Gajim.appdata.xml.in:26
 msgid "Metacontacts support"
-msgstr ""
+msgstr "Metakontakt-støtte"
 
 #: data/org.gajim.Gajim.appdata.xml.in:27
 msgid "Trayicon, speller, extended chat history functionalities"
-msgstr ""
+msgstr "Systemkurvsikon, svavekontroll, utvidet sludrehistorikkfunksjonalitet"
 
 #: data/org.gajim.Gajim.appdata.xml.in:28
 msgid "TLS, GPG and End-To-End encryption support"
-msgstr ""
+msgstr "TLS, GPG og ende-til-ende -krypterings-støtte"
 
 #: data/org.gajim.Gajim.appdata.xml.in:29
 msgid "Transport registration support"
-msgstr ""
+msgstr "Transportregistreringsstøtte"
 
 #: data/org.gajim.Gajim.appdata.xml.in:30
-#, fuzzy
 msgid "Service discovery including nodes, user search"
-msgstr "Se etter Tjenester med %s kontoen"
+msgstr "Tjenesteoppdagelse med noder, brukersøk"
 
 #: data/org.gajim.Gajim.appdata.xml.in:31
 msgid "Wikipedia, dictionary and search engine lookup"
-msgstr ""
+msgstr "Wikipedia, ordbok og søkemotoroppslag"
 
 #: data/org.gajim.Gajim.appdata.xml.in:32
 msgid "Multiple accounts support"
-msgstr ""
+msgstr "Støtte for flere kontoer"
 
 #: data/org.gajim.Gajim.appdata.xml.in:33
-#, fuzzy
 msgid "XML console interface"
-msgstr "XML Konsoll"
+msgstr "XML-konsollgrensesnitt"
 
 #: 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 ""
+msgstr "Andre funksjoner via programtillegg"
 
 #: data/org.gajim.Gajim.appdata.xml.in:47
-#, fuzzy
 msgid "Roster, list of contacts"
-msgstr "_Logg status endringer til kontakter"
+msgstr "Kontaktliste, liste over kontakter"
 
 #: data/org.gajim.Gajim.appdata.xml.in:51
 msgid "Tabbed chat window"
-msgstr ""
+msgstr "Fanebasert sludrevindu"
 
 #: data/org.gajim.Gajim.appdata.xml.in:55
-#, fuzzy
 msgid "Group chat support"
-msgstr "Gruppesamtaler"
+msgstr "Gruppesludringsstøtte"
 
 #: data/org.gajim.Gajim.appdata.xml.in:59
-#, fuzzy
 msgid "Chat history"
-msgstr "Nylig:"
+msgstr "Sludrehistorikk"
 
 #: data/org.gajim.Gajim.appdata.xml.in:63
-#, fuzzy
 msgid "Plugin manager"
-msgstr "Registrering feilet"
+msgstr "Programtilleggsbehandler"
+
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Viser eller skjuler kontaktlistevinduet"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Viser eller skjuler ipython-vinduet"
 
 #, fuzzy
 #~ msgid "XMPP account %s"
@@ -11011,22 +10754,21 @@ msgstr "Registrering feilet"
 #~ "<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."
+#~ "<b>noen@noenstedshen.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"
+#~ "Mellomromsinndelt ordnet liste av tilkoblingstyper som skal prøves. Kan "
+#~ "inneholde 'TLS', 'SSL' eller 'klartekst'"
 
 #~ msgid "_Actions"
 #~ msgstr "_Handlinger"
 
-#, fuzzy
 #~ msgid "Requires upower and python-dbus."
-#~ msgstr "Krever python-dbus."
+#~ msgstr "Krever upower og python-dbus."
 
 #, fuzzy
 #~ msgid "Start Chat..."
@@ -11036,15 +10778,15 @@ msgstr "Registrering feilet"
 #~ msgstr "Du er allerede i gruppesamtale %s"
 
 #~ msgid "Join Group Chat with account %s"
-#~ msgstr "Bli med i samtalegruppe med konto %s"
+#~ msgstr "Ta del i samtalegruppe med kontoen %s"
 
 #~ msgid "Invalid Account"
-#~ msgstr "Ugyldig Konto"
+#~ msgstr "Ugyldig konto"
 
 #~ msgid ""
 #~ "You have to choose an account from which you want to join the groupchat."
 #~ msgstr ""
-#~ "Du har valgt en konto som du ønsker å bruke for å gå inn i samtalerommet."
+#~ "Du har valgt en konto du ønsker å bruke for å gå inn i samtalerommet."
 
 #, fuzzy
 #~ msgid "Please enter the group chat JID as room@server."
@@ -11055,7 +10797,7 @@ msgstr "Registrering feilet"
 #~ msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
 #~ msgid "Start Chat with account %s"
-#~ msgstr "Start samtale med konto %s"
+#~ msgstr "Start samtale med kontoen %s"
 
 #, fuzzy
 #~ msgid ""
@@ -11070,59 +10812,59 @@ msgstr "Registrering feilet"
 #~ msgstr "Duplikat Jabber ID"
 
 #~ msgid "Unable to parse \"%s\"."
-#~ msgstr "Kan ikke analysere \"%s\"."
+#~ msgstr "Kan ikke tolke \"%s\"."
 
 #~ msgid "Shows the chat dialog so that you can send messages to a contact"
-#~ msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
+#~ msgstr "Viser samtalevinduet, slik at du kan sende meldinger til en kontakt"
 
 #~ msgid "JID of the contact that you want to chat with"
-#~ msgstr "JID til kontakten du ønsker å snakke med"
+#~ msgstr "JID-en til kontakten du vil sludre med"
 
 #~ msgid "message content. The account must be specified or \"\""
-#~ msgstr "meldings innhold. Kontoen må spesifiseres eller \"\""
+#~ msgstr "meldingsinnhold. Kontoen må enten spesifiseres eller \"\""
 
 #~ msgid "Adds contact to roster"
-#~ msgstr "Legger til kontakt til kontaktlisten"
+#~ msgstr "Legger til kontakt på kontaktliste"
 
 #~ msgid "jid"
-#~ msgstr "jid"
+#~ msgstr "JID"
 
 #~ msgid "Adds new contact to this account"
-#~ msgstr "Legger til en ny kontakt til denne kontoen."
+#~ msgstr "Legger til ny kontakt på denne kontoen"
 
 #~ msgid "Opens 'Start Chat' dialog"
-#~ msgstr "Ã…pner 'Start Samtale' dialogen"
+#~ msgstr "Ã…pner 'Start samtale'-vindu"
 
 #~ msgid "Starts chat, using this account"
-#~ msgstr "Starter samtale, med denne kontoen"
+#~ msgstr "Starter en samtale, ved bruk av denne kontoen"
 
 #, fuzzy
 #~ msgid "Handle a xmpp:/ URI"
 #~ msgstr "HÃ¥ndtere en xmpp:/ uri"
 
 #~ msgid "URI to handle"
-#~ msgstr "URI til håndgrep"
+#~ msgstr "URI å håndtere"
 
 #~ msgid "Account in which you want to handle it"
-#~ msgstr "Konto som du ønsker å benytte for å håndtere det"
+#~ msgstr "Dertil ønsket konto"
 
 #~ msgid "Message content"
-#~ msgstr "Meldings innhold"
+#~ msgstr "Meldingsinnhold"
 
 #~ msgid "Join a MUC room"
-#~ msgstr "Bli med i et MUC rom"
+#~ msgstr "Ta del i et MUC-rom"
 
 #~ msgid "Room JID"
-#~ msgstr "Rom JID"
+#~ msgstr "Rom-JID"
 
 #~ msgid "Nickname to use"
 #~ msgstr "Kallenavn å bruke"
 
 #~ msgid "Password to enter the room"
-#~ msgstr "Passord for å komme inn i rommet"
+#~ msgstr "Adgangskode for å tilslutte seg rommet"
 
 #~ msgid "Account from which you want to enter the room"
-#~ msgstr "Konto som du ønsker å bruke for å gå inn i rommet"
+#~ msgstr "Konto du ønsker å bruke til å ta del i rommet"
 
 #, fuzzy
 #~ msgid "Wrong URI"
@@ -11132,22 +10874,19 @@ msgstr "Registrering feilet"
 #~ msgstr "Kallenavn:"
 
 #~ msgid "Server:"
-#~ msgstr "Server:"
+#~ msgstr "Tjener:"
 
 #~ msgid "Password:"
 #~ msgstr "Passord:"
 
-#, fuzzy
 #~ msgid "Join this room _automatically when I connect"
-#~ msgstr "GÃ¥ inn i dette rommet automatisk ved tilkobling"
+#~ msgstr "Ta del i dette rommet _automatisk ved tilkobling"
 
-#, fuzzy
 #~ msgid "Bro_wse Rooms"
-#~ msgstr "_Utforsk"
+#~ msgstr "_Utforsk rom"
 
-#, fuzzy
 #~ msgid "Requires libgtkspell and libenchant."
-#~ msgstr "Krever libgtkspell."
+#~ msgstr "Krever libgtkspell og libenchant."
 
 #, fuzzy
 #~ msgid "Network-Watcher"
@@ -11160,13 +10899,11 @@ msgstr "Registrering feilet"
 #~ msgid "Requires gnome-network-manager"
 #~ msgstr "Krever gnome-network-manager og python-dbus."
 
-#, fuzzy
 #~ msgid "Feature not available, see Help->Features"
-#~ msgstr "Funksjon ikke tilgjengelig i Windows."
+#~ msgstr "Funksjon ikke tilgjengelig, se Hjelp → Funksjoner"
 
-#, fuzzy
 #~ msgid "Send files"
-#~ msgstr "Send Fil"
+#~ msgstr "Send filer"
 
 #~ msgid "This contact does not support file transfer."
 #~ msgstr "Denne kontakten støtter ikke filoverføring."
@@ -11180,29 +10917,28 @@ msgstr "Registrering feilet"
 #~ "language by setting the speller_language option."
 #~ msgstr ""
 #~ "Du må installere %s ordbok for å bruke stavekontroll, eller velge et "
-#~ "annet språk ved å sette stavekontro_llspråk valget."
+#~ "annet språk ved å gjøre valg av stavekontro_llspråk."
 
 #~ msgid "Hides the buttons in chat windows."
-#~ msgstr "Gjemmer knappene i samtale vinduer."
+#~ msgstr "Gjemmer knappene i samtalevinduer."
 
 #~ msgid "Change your nickname (Ctrl+N)"
-#~ msgstr "Endre ditt _Kallenavn (Ctrl+N)"
+#~ msgstr "Endre _kallenavnet ditt (Ctrl+N)"
 
 #~ msgid "Change the room's subject (Alt+T)"
-#~ msgstr "Endre rommets emne (Alt+T)"
+#~ msgstr "Endre rommets tema (Alt+T)"
 
 #~ msgid "Bookmark this room (Ctrl+B)"
 #~ msgstr "_Bokmerke dette rommet (Ctrl+B)"
 
 #~ msgid "Browse the chat history (Ctrl+H)"
-#~ msgstr "Søk gjennom samtale historikken (Ctrl+H)"
+#~ msgstr "Søk gjennom samtalehistorikken (Ctrl+H)"
 
-#, fuzzy
 #~ msgid "Show advanced functions (Alt+D)"
-#~ msgstr "Vis en meny med avanserte funksjoner (Alt+A)"
+#~ msgstr "Vis avanserte funksjoner (Alt+D)"
 
 #~ msgid "Add this contact to roster (Ctrl+D)"
-#~ msgstr "Legg til kontakt til kontaktlisten (Ctrl+D)"
+#~ msgstr "Legg denne kontakten til i kontaktlista (Ctrl+D)"
 
 #~ msgid "Invite contacts to the conversation (Ctrl+G)"
 #~ msgstr "Inviter kontakter til samtalen (Ctrl+G)"
@@ -11215,79 +10951,73 @@ msgstr "Registrering feilet"
 #~ msgstr "Vis kontaktens profil (Ctrl+I)"
 
 #~ msgid "Ma_ke message windows compact"
-#~ msgstr "Gj_ør meldings vinduet kompakt"
+#~ msgstr "Gj_ør meldingsvinduet kompakt"
 
 #~ msgid "Hide all buttons in chat windows"
-#~ msgstr "Gjem alle knapper i samtale vinduer"
+#~ msgstr "Gjem alle knappene i samtalevinduer"
 
-#, fuzzy
 #~ msgid "Hide the chat buttons"
-#~ msgstr "Bruk: /%s, gjemmer samtale knappene."
+#~ msgstr "Gjem samtaleknappene"
 
 #~ 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."
 #~ msgstr ""
-#~ "Dersom True vil Gajim spør etter ikonbilde for hver kontakt som ikke "
-#~ "hadde et ikonbilde sist gang eller har en lagret som er for gammel."
+#~ "Hvis sant vil Gajim forespørre miniatyrbilde for hver kontakt som ikke "
+#~ "hadde en avatar sist gang, eller har en mellomlagret som er for gammel."
 
 #~ msgid "Disk Write Error"
-#~ msgstr "Disk Skrive Feil"
+#~ msgstr "Skrivefeil til disk"
 
 #~ msgid "Set Custom _Avatar..."
-#~ msgstr "Velg Egendefinert _Avatar..."
+#~ msgstr "Velg egendefinert _avatar…"
 
-#, fuzzy
 #~ msgid "SSL certificate validation"
-#~ msgstr "SSL sertifikats validering"
+#~ msgstr "SSL-sertifikat-gyldighetssjekk"
 
 #~ msgid ""
 #~ "A library used to validate server certificates to ensure a secure "
 #~ "connection."
 #~ msgstr ""
-#~ "Et bibliotek som brukes til å verifisere server sertifikater for å sikre "
-#~ "en sikker tilkobling."
+#~ "Et bibliotek brukt til å bekrefte tjener-sertifikater for å tilsørge en "
+#~ "sikker tilkobling."
 
-#, fuzzy
 #~ msgid "Requires python-pyopenssl > 0.12 and pyasn1."
-#~ msgstr "Krever python-pyopenssl."
+#~ msgstr "Krever python-pyopenssl > 0.12 og pyasn1."
 
-#, fuzzy
 #~ msgid "?CLI:room"
-#~ msgstr "rom"
+#~ msgstr "?CLI:rom"
 
-#, fuzzy
 #~ msgid "?CLI:nick"
-#~ msgstr "kallenavn"
+#~ msgstr "?CLI:kallenavn"
 
-#, fuzzy
 #~ msgid "?CLI:password"
-#~ msgstr "passord"
+#~ msgstr "?CLI:passord"
 
 #~ msgid "Use D-Bus and Notification-Daemon to show notifications"
-#~ msgstr "Bruk D-Bus og Hendelses-Tjenesten for å vise hendelser"
+#~ msgstr "Bruk D-Bus og hendelses-nissen for å vise merknader"
 
 #~ msgid "Notification"
-#~ msgstr "Varslinger"
+#~ msgstr "Merknad"
 
 #~ msgid "Passive popups notifying for new events."
-#~ msgstr "Passiv påminnelse for nye hendelser."
+#~ msgstr "Passivt oppsprettsvindu for nye hendelser."
 
 #~ msgid ""
 #~ "Requires python-notify or instead python-dbus in conjunction with "
 #~ "notification-daemon."
 #~ msgstr ""
-#~ "Krever python-notify eller alternativt python-dbus i samarbeid med "
+#~ "Krever python-notify eller alternativt python-dbus i samråd med "
 #~ "notification-daemon."
 
 #~ msgid "Ignore"
 #~ msgstr "Ignorer"
 
 #~ msgid "_Open Gmail Inbox"
-#~ msgstr "_Ã…pne Gmail Innboks"
+#~ msgstr "_Ã…pne Gmail-innboks"
 
 #~ msgid "Notify on new _GMail email"
-#~ msgstr "Alarmér om nye _Gmail e-post"
+#~ msgstr "Meld fra om ny e-post i _Gmail"
 
 #~ msgid ""
 #~ "If checked, Gajim will show a notification when a new e-mail is received "
@@ -11296,29 +11026,26 @@ msgstr "Registrering feilet"
 #~ "Dersom valgt vil Gajim vise en melding når en ny e-post mottas fra GMail"
 
 #~ msgid "Display _extra email details"
-#~ msgstr "Vis _ekstra e-post detaljer"
+#~ msgstr "Vis _ekstra e-postdetaljer"
 
-#, fuzzy
 #~ msgid ""
 #~ "If checked, Gajim will also include information about the sender of new "
 #~ "emails"
 #~ msgstr ""
-#~ "Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-"
-#~ "post"
+#~ "Dersom valgt vil Gajim også vise informasjon om avsenderen av nye e-poster"
 
 #~ msgid "<b>GMail Options</b>"
-#~ msgstr "<b>GMail Valg</b>"
+#~ msgstr "<b>GMail-valg</b>"
 
 #, fuzzy
 #~ msgid "20"
 #~ msgstr "0"
 
-#, fuzzy
 #~ msgid "Invited %s to %s"
-#~ msgstr "Send %s til %s"
+#~ msgstr "Inviterte %s til %s"
 
 #~ msgid "GMail Email Received"
-#~ msgstr "Gmail E-post Motatt"
+#~ msgstr "Gmail E-post motatt"
 
 #, fuzzy
 #~ msgid "New e-mail on %(gmail_mail_address)s"
@@ -11340,14 +11067,14 @@ msgstr "Registrering feilet"
 #~ "\n"
 #~ "\n"
 #~ "Fra: %(from_address)s\n"
-#~ "Tittel: %(subject)s\n"
+#~ "Emne: %(subject)s\n"
 #~ "%(snippet)s"
 
 #~ msgid "Re_name"
 #~ msgstr "Gi _nytt navn"
 
 #~ msgid "Resour_ce:"
-#~ msgstr "Ressur_s:"
+#~ msgstr "Ressu_rs:"
 
 #~ msgid ""
 #~ "Resource is sent to the Jabber server in order to separate the same JID "
@@ -11356,92 +11083,90 @@ msgstr "Registrering feilet"
 #~ "same account with resource 'Home' and 'Work' at the same time. The "
 #~ "resource which has the highest priority will get the events. (see below)"
 #~ msgstr ""
-#~ "Ressurs navnet blir sendt til Jabber serveren for å separere JID'en din i "
-#~ "to eller flere deler alt etter hvor mange ganger du er tilkoblet til "
-#~ "serveren (samtidig). Dette gjør at du kan være tilkoblet med samme konto "
-#~ "med ressurs navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest "
-#~ "prioritet vil få hendelsene. (se under)"
+#~ "Ressurs-navnet blir sendt til XMPP-tjeneren for å dele JID-en din i to "
+#~ "eller flere biter, avhenging av antall ganger du har vært tilkoblet samme "
+#~ "tjener med samme konto. Noe som gjør at ressursene 'Hjemme' og 'Jobb' kan "
+#~ "være tilkoblet samtidig på samme konto. Ressursen med høyest prioritet "
+#~ "vil få hendelsene. (se nedenfor)"
 
 #~ msgid "A_djust to status"
-#~ msgstr "J_ustér etter status"
+#~ msgstr "J_uster etter status"
 
 #~ msgid "Priority will change automatically according to your status."
-#~ msgstr "Prioritet vil endres automatisk etter din status."
+#~ msgstr "Prioritet vil endres automatisk i henhold til status."
 
 #~ msgid "Anonymous authentication"
-#~ msgstr "Anonym autentisering"
+#~ msgstr "Anonym identitetsbekreftelse"
 
 #~ msgid ""
 #~ "Priority is used in Jabber to determine who gets the events from the "
 #~ "jabber server when two or more clients are connected using the same "
 #~ "account; The client with the highest priority gets the events"
 #~ msgstr ""
-#~ "Prioritet brukes av Jabber for å finne ut hvem som skal få hendelser fra "
-#~ "jabber serveren når to eller flere klienter er tilkoblet med samme konto. "
-#~ "Klienten med den høyeste prioriteten vil få hendelsen"
+#~ "Prioritet brukes av XMPP for å fastsette hvem som skal få hendelser fra "
+#~ "XMPP-tjeneren når to eller flere klienter er tilkoblet med samme konto. "
+#~ "Klienten høyest prioritet vil få hendelsen"
 
-#, fuzzy
 #~ msgid "Synchronize contacts"
-#~ msgstr "_Synkroniser kontakter"
+#~ msgstr "Synkroniser kontakter"
 
 #~ msgid "Click to request authorization to all contacts of another account"
-#~ msgstr "Klikk for å be om attestering fra alle kontakter av en annen konto"
+#~ msgstr ""
+#~ "Klikk for å be om tilgang til alle kontakter tilhørende en annen konto"
 
 #~ msgid "Chan_ge Password"
 #~ msgstr "En_dre Passord"
 
 #~ msgid "Click to change account's password"
-#~ msgstr "Klikk for å forandre kontoens passord"
+#~ msgstr "Klikk for å endre kontoens passord"
 
 #~ msgid "Administration operations"
-#~ msgstr "Administrators oppgaver"
+#~ msgstr "Administrator-handlinger"
 
-#, fuzzy
 #~ msgid "Browse..."
-#~ msgstr "_Utforsk"
+#~ msgstr "Utforsk…"
 
-#, fuzzy
 #~ msgid "Certificate is e_ncrypted"
-#~ msgstr "Sertifikatet avvist"
+#~ msgstr "Sertifikatet er k_ryptert"
 
 #~ msgid ""
 #~ "If checked, Gajim, when launched, will automatically connect to jabber "
 #~ "using this account"
 #~ msgstr ""
-#~ "Dersom valgt, vil Gajim automatisk koble seg til jabber med denne kontoen "
-#~ "ved oppstart"
+#~ "Hvis valgt, vil Gajim ved oppstart automatisk koble seg til XMPP med "
+#~ "denne kontoen"
 
-#, fuzzy
 #~ msgid "Synchronize logs with server"
-#~ msgstr "_Synkroniser kontakter"
+#~ msgstr "Synkroniser logger med tjener"
 
 #~ msgid "Synch_ronize account status with global status"
-#~ msgstr "Synk_roniser konto status med global status"
+#~ msgstr "Sam_kjør konto-status med global status"
 
 #~ msgid ""
 #~ "If checked, any change to the global status (handled by the combobox at "
 #~ "the bottom of the roster window) will change the status of this account "
 #~ "accordingly"
 #~ msgstr ""
-#~ "Dersom valgt vil endringer til global status (håndtert av kombomenyen "
-#~ "nederst i kontaktvinduet) endre status på denne kontoen. "
+#~ "Dersom valgt vil endringer i global status (håndtert av "
+#~ "kombinasjonsmenyen nederst i kontaktvinduet) endre status for denne "
+#~ "kontoen"
 
 #~ msgid ""
 #~ "If checked, Gajim will also broadcast some more IPs except from just your "
 #~ "IP, so file transfer has higher chances of working."
 #~ msgstr ""
-#~ "Dersom valgt vil Gajim sende ut noen flere IP adresser i tillegg til din "
-#~ "egen, så filoverføringen har større mulighet for å fungere. "
+#~ "Dersom valgt vil Gajim sende ut noen flere IP-adresser i tillegg til din "
+#~ "egen, så filoverføringen har større mulighet for å fungere."
 
 #~ msgid "<b>Proxy</b>"
-#~ msgstr "<b>Proxy</b>"
+#~ msgstr "<b>Mellomtjener</b>"
 
 #~ msgid ""
 #~ "Check this so Gajim will ask you before sending your password over an "
 #~ "insecure connection."
 #~ msgstr ""
-#~ "Velg denne slik at Gajim vil spør deg før sending av passordet over en "
-#~ "usikker tilkobling"
+#~ "Kryss av her slik at Gajim forespør deg før forsendelse av passord over "
+#~ "usikker tilkobling blir gjort"
 
 #~ msgid "Send _keep-alive packets"
 #~ msgstr "Send _hold-i-live pakker"
@@ -11450,46 +11175,46 @@ msgstr "Registrering feilet"
 #~ "If checked, Gajim will send keep-alive packets to prevent connection "
 #~ "timeout which results in disconnection"
 #~ msgstr ""
-#~ "Dersom valgt vil Gajim sende hold-i-live pakker så man ikke får et "
-#~ "tidsavbrudd som resulterer i frakobling"
+#~ "Dersom valgt vil Gajim sende hold-i-live pakker for å forhindre "
+#~ "tidsavbrudd som dernest resulterer i frakobling"
 
 #~ msgid "Use cust_om hostname/port"
-#~ msgstr "Bruk egen_definert maskinnavn/port"
+#~ msgstr "Bruk egen_definert vertsnavn/port"
 
 #~ msgid "_Hostname: "
-#~ msgstr "_Maskinnavn:"
+#~ msgstr "_Vertsnavn: "
 
 #~ msgid "_Port: "
-#~ msgstr "_Port:"
+#~ msgstr "_Port: "
 
 #~ msgid "No key selected"
 #~ msgstr "Ingen nøkkel valgt"
 
 #~ msgid "Choose _Key..."
-#~ msgstr "Velg _Nøkkel..."
+#~ msgstr "Velg _nøkkel…"
 
 #~ msgid ""
 #~ "If checked, Gajim will get the password from a GPG agent like seahorse"
 #~ msgstr ""
-#~ "Dersom valgt vil Gajim få passordet fra en GPG agent slik som seahorse"
+#~ "Dersom valgt vil Gajim få passordet fra en GPG-agent som f.eks. seahorse"
 
 #~ msgid "<b>OpenPGP</b>"
 #~ msgstr "<b>OpenPGP</b>"
 
 #~ msgid "_Edit Personal Information..."
-#~ msgstr "_Rediger Personlig Informasjon..."
+#~ msgstr "_Endre personalia…"
 
 #~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informasjon om deg, slik som den er lagret på serveren"
+#~ msgstr "Informasjon om deg, slik som den er lagret på tjeneren"
 
 #~ msgid "<b>Personal Information</b>"
-#~ msgstr "<b>Personlig Informasjon</b>"
+#~ msgstr "<b>Personlig informasjon</b>"
 
 #~ msgid "Co_nnect on Gajim startup"
 #~ msgstr "Ko_ble til når Gajim starter"
 
 #~ msgid "Synchroni_ze account status with global status"
-#~ msgstr "Synkroni_ser konto status med global status"
+#~ msgstr "Sam_kjør konto-status med global status"
 
 #~ msgid "Use cust_om port:"
 #~ msgstr "Bruk egen_definert port:"
@@ -11499,43 +11224,43 @@ msgstr "Registrering feilet"
 #~ "your setup you can select another one here.\n"
 #~ "You might consider to change possible firewall settings."
 #~ msgstr ""
-#~ "Dersom standard porten som brukes til inngående meldinger ikke passer for "
-#~ "ditt oppsett kan du velge en annen her.\n"
-#~ "Du kan også vurdere å endre mulige brannmur innstillinger."
+#~ "Dersom forvalgt port brukt til inngående meldinger ikke passer for ditt "
+#~ "oppsett kan du velge en annen her.\n"
+#~ "Du kan også vurdere å endre mulige brannmursinnstillinger."
 
 #~ msgid "Mer_ge accounts"
 #~ msgstr "Sammenslåin_g av kontoer"
 
 #~ msgid "OpenPGP is not usable on this computer"
-#~ msgstr "OpenPGP kan ikke brukes på denne maskinen"
+#~ msgstr "OpenPGP er ikke brukbart på denne maskinen"
 
 #~ msgid "To change the account name, you must be disconnected."
-#~ msgstr "For å endre konto navnet må du ikke være tilkoblet."
+#~ msgstr "For å endre kontonavnet må være frakoblet."
 
 #~ msgid "To change the account name, you must read all pending events."
-#~ msgstr "For å endre konto navnet må du lese alle ventende hendelser."
+#~ msgstr "For å endre kontonavnet må du lese alle ventende hendelser."
 
 #~ msgid "Account Name Already Used"
-#~ msgstr "Konto Navnet er Allerede i Bruk"
+#~ msgstr "Kontonavnet er allerede i bruk"
 
 #~ msgid ""
 #~ "This name is already used by another of your accounts. Please choose "
 #~ "another name."
 #~ msgstr ""
-#~ "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst "
-#~ "velg et annet navn."
+#~ "Dette navnet er allerede i bruk av en av dine andre kontoer. Velg et "
+#~ "annet navn."
 
 #~ msgid "Invalid account name"
-#~ msgstr "Ugyldig konto navn"
+#~ msgstr "Ugyldig kontonavn"
 
 #~ msgid "Account name cannot be empty."
-#~ msgstr "Konto navn kan ikke være tomt."
+#~ msgstr "Kontonavn kan ikke være tomt."
 
 #~ msgid "Account name cannot contain spaces."
-#~ msgstr "Konto navn kan ikke inneholde mellomrom."
+#~ msgstr "Kontonavn kan ikke inneholde mellomrom."
 
 #~ msgid "Enter a new name for account %s"
-#~ msgstr "Skriv inn nytt navn for konto %s"
+#~ msgstr "Skriv inn nytt navn for kontoen %s"
 
 #, fuzzy
 #~ msgid "A JID must be in the form \"user@servername\"."
@@ -11546,117 +11271,110 @@ msgstr "Registrering feilet"
 
 #~ msgid ""
 #~ "You must create your account before editing your personal information."
-#~ msgstr "Du må lage en konto før du kan redigere din personlige informasjon."
+#~ msgstr "Du må opprette konto før du kan endre personalia."
 
 #~ msgid "Without a connection, you can not edit your personal information."
-#~ msgstr "Du kan ikke endre din personlige informasjon uten å være tilkoblet."
+#~ msgstr "Du kan ikke endre personalia uten å være tilkoblet."
 
 #, fuzzy
 #~ msgid "Your server does not have vCard support"
 #~ msgstr "Din server støtter ikke Vcard"
 
 #~ msgid "Your server can't save your personal information."
-#~ msgstr "Din server kan ikke lagre din personlige informasjon."
+#~ msgstr "Tjeneren din kan ikke lagre personalia."
 
 #~ msgid "Account Local already exists."
-#~ msgstr "Konto Lokal eksisterer allerede."
+#~ msgstr "Lokal konto eksisterer allerede."
 
 #~ msgid "Please rename or remove it before enabling link-local messaging."
-#~ msgstr ""
-#~ "Vennligst omdøp eller fjern den før du slår på link-lokal meldinger."
+#~ msgstr "Gi nytt navn eller fjern den før du slår på link-lokal -meldinger."
 
 #~ msgid "THANKS:"
 #~ msgstr "TUSEN TAKK:"
 
 #~ msgid "Could not write to %s. Session Management support will not work"
-#~ msgstr ""
-#~ "Kunne ikke skrive til %s. Sesjons Håndterings støtte vil ikke virke."
+#~ msgstr "Kunne ikke skrive til %s. Støtte for øktbehandling vil utgå"
 
 #~ msgid "<b>Jabber Traffic</b>"
-#~ msgstr "<b>Jabber Trafikk</b>"
+#~ msgstr "<b>XMPP-trafikk</b>"
 
 #~ msgid "_Enable"
 #~ msgstr "_Slå på"
 
-#, fuzzy
 #~ msgid "<b>Filter</b>"
-#~ msgstr "<b>Font</b>"
+#~ msgstr "<b>Filter</b>"
 
 #~ msgid "_IQ"
 #~ msgstr "_IQ"
 
 #~ msgid "Info/Query"
-#~ msgstr "Informasjon/Spørring"
+#~ msgstr "Informasjon/spørring"
 
 #~ msgid "_Message"
 #~ msgstr "_Melding"
 
 #~ msgid "<b>XML Input</b>"
-#~ msgstr "<b>XML Input</b>"
+#~ msgstr "<b>XML-inndata</b>"
 
 #~ msgid "Show _XML Console"
-#~ msgstr "Vis _XML Konsoll"
+#~ msgstr "Vis _XML-konsoll"
 
 #~ msgid "Edit _Privacy Lists..."
-#~ msgstr "Rediger _Private Lister..."
+#~ msgstr "Rediger _personvernslister…"
 
 #~ msgid "_Administrator"
 #~ msgstr "_Administrator"
 
 #~ msgid "Sends a message to users currently connected to this server"
-#~ msgstr "Sender en melding til alle tilkoblede brukere på denne serveren"
+#~ msgstr "Sender en melding til alle tilkoblede brukere av denne tjeneren"
 
 #~ msgid "Sets Message of the Day"
-#~ msgstr "Setter Melding for Dagen"
+#~ msgstr "Setter dagens melding"
 
 #~ msgid "Updates Message of the Day"
-#~ msgstr "Uppdaterer Melding for Dagen"
+#~ msgstr "Oppdaterer dagens melding"
 
 #~ msgid "Deletes Message of the Day"
-#~ msgstr "Sletter Meling for Dagen"
+#~ msgstr "Sletter dagens melding"
 
-#, fuzzy
 #~ msgid "No"
 #~ msgstr "Ingen"
 
-#, fuzzy
 #~ msgid "Prefer"
-#~ msgstr "Tilstedeværelse"
+#~ msgstr "Foretrekk"
 
-#, fuzzy
 #~ msgid "Auto"
-#~ msgstr "Auto bli med"
+#~ msgstr "Auto"
 
 #~ msgid "Toggle Open_PGP Encryption"
-#~ msgstr "Endre Open_PGP Kryptering"
+#~ msgstr "Veksle Open_PGP-kryptering"
 
 #~ msgid "Toggle End to End Encryption"
-#~ msgstr "Endre Ende til Ende Kryptering"
+#~ msgstr "Endre ende-til-ende -kryptering"
 
-#, fuzzy
 #~ msgid "otr"
-#~ msgstr "Varm"
+#~ msgstr "OTR"
 
 #~ msgid "Message Body <currently unused, so it's hidden by default>"
-#~ msgstr "Meldings Kropp <brukes ikke, derfor gjemt som standard>"
+#~ msgstr "Meldingskropp <for tiden ubrukt, derfor gjemt som forvalg>"
 
 #~ msgid "Add _Contact..."
-#~ msgstr "Legg til _Kontakt..."
+#~ msgstr "Legg til _kontakt…"
 
 #~ msgid "_Accounts"
 #~ msgstr "_Kontoer"
 
 #~ msgid "Profile, A_vatar"
-#~ msgstr "Profil, B_ilde"
+#~ msgstr "Profil, a_vatar"
 
 #~ msgid "File _Transfers"
-#~ msgstr "Fil _Overføringer"
+#~ msgstr "Fil _overføringer"
 
 #~ msgid "Help online"
-#~ msgstr "Hjelp online"
+#~ msgstr "Hjelp på nett"
 
 #~ msgid "Frequently Asked Questions (online)"
-#~ msgstr "Ofte Stilte Spørsmål (online)"
+#~ msgstr "Ofte stilte spørsmål (nettbasert)"
 
 #~ msgid "Fea_tures"
 #~ msgstr "Fun_ksjoner"
@@ -11665,31 +11383,27 @@ msgstr "Registrering feilet"
 #~ msgid "Idle for:"
 #~ msgstr "XML Konsoll for %s"
 
-#, fuzzy
 #~ msgid "OpenPGP encryption enabled"
-#~ msgstr "GPG kryptering påslått"
+#~ msgstr "OpenPGP-kryptering påskrudd"
 
-#, fuzzy
 #~ msgid "No OpenPGP key assigned"
-#~ msgstr "Ingen GPG nøkkel tildelt"
+#~ msgstr "Ingen OpenPGP-nøkkel tildelt"
 
-#, fuzzy
 #~ msgid ""
 #~ "No OpenPGP key is assigned to this contact. So you cannot encrypt "
 #~ "messages with OpenPGP."
 #~ msgstr ""
-#~ "Ingen GPG nøkkel er tildelt denne kontakten, så du kan ikke kryptere "
-#~ "meldinger med GPG."
+#~ "Ingen OpenPGP-nøkkel tildelt denne kontakten. Så du kan ikke kryptere "
+#~ "meldinger med OpenPGP."
 
-#, fuzzy
 #~ msgid "OpenPGP encryption disabled"
-#~ msgstr "GPG kryptering avslått"
+#~ msgstr "OpenPGP-kryptering avskrudd"
 
 #~ msgid "Session WILL be logged"
-#~ msgstr "Sesjonen VIL bli logget"
+#~ msgstr "Økta VIL bli loggført"
 
 #~ msgid "Session WILL NOT be logged"
-#~ msgstr "Sesjonen VIL IKKE bli logget"
+#~ msgstr "Økta VIL IKKE bli logget"
 
 #~ msgid "is"
 #~ msgstr "er"
@@ -11704,21 +11418,20 @@ msgstr "Registrering feilet"
 #~ msgstr "vil IKKE"
 
 #~ msgid "The following message was NOT encrypted"
-#~ msgstr "Den følgende meldingen ble IKKE kryptert"
+#~ msgstr "Følgende melding ble IKKE kryptert"
 
 #~ msgid "The following message was encrypted"
-#~ msgstr "Den følgende meldingen ble kryptert"
+#~ msgstr "Følgende melding ble kryptert"
 
 #~ msgid ""
 #~ "The database file (%s) cannot be read. Try to repair it or remove it (all "
 #~ "history will be lost)."
 #~ msgstr ""
-#~ "Database filen (%s) kan ikke leses. Prøv å reparer den eller fjern den "
-#~ "(all historikk vil bli tapt)."
+#~ "Database-fila (%s) kan ikke leses. Prøv å reparere den eller fjern den "
+#~ "(all historikk vil gå tapt)."
 
-#, fuzzy
 #~ msgid "Toggle the OpenPGP encryption"
-#~ msgstr "Endre Open_PGP Kryptering"
+#~ msgstr "Veksle OpenPGP-kryptering"
 
 #~ msgid "How many minutes should last lines from previous conversation last."
 #~ msgstr ""
@@ -11730,22 +11443,20 @@ msgstr "Registrering feilet"
 #~ "set to False and they sync with global status) based upon the status of "
 #~ "the network connection."
 #~ msgstr ""
-#~ "Dersom True så lytt til D-Bus signaler fra NetworkManager og endre status "
-#~ "for kontoer (gitt at de ikke har listen_to_network_manager satt til False "
-#~ "og at de synkroniserer med global status) basert på statusen til "
-#~ "nettverks tilkoblingen."
+#~ "Hvis sant, skal det lyttes til D-Bus-signaler fra NetworkManager og endre "
+#~ "status for kontoer (gitt at de ikke har listen_to_network_manager satt "
+#~ "til usant og at de samkjører med global status,) basert på statusen til "
+#~ "nettverks-tilkoblingen."
 
 #~ msgid "Smooth scroll message in conversation window"
-#~ msgstr "Jevn tekstrulling av meldinger i samtale vinduene"
+#~ msgstr "Jevntrullende tekst i meldinger i samtalevinduet"
 
-#, fuzzy
 #~ msgid ""
 #~ "Ask offline status message to all offline contacts when connection to an "
 #~ "account is established. WARNING: This causes a lot of requests to be sent!"
 #~ msgstr ""
-#~ "Spør om frakoblet status melding til alle frakoblede kontakter når en "
-#~ "tilkobling til en konto etableres. ADVARSEL: Dette forårsaker mange "
-#~ "forespørsler!"
+#~ "Spør om frakoblet statusmelding for alle kontakter ved tilkobling. "
+#~ "ADVARSEL: Dette medfører mange forespørsler!"
 
 #~ msgid "Is OpenPGP enabled for this contact?"
 #~ msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
@@ -11754,24 +11465,26 @@ msgstr "Registrering feilet"
 #~ "Should Gajim automatically start an encrypted session with this contact "
 #~ "when possible?"
 #~ msgstr ""
-#~ "Skal Gajim automatisk starte en kryptert sesjon med denne kontakten når "
-#~ "mulig?"
+#~ "Skal Gajim automatisk starte ei kryptert økt med denne kontakten når det "
+#~ "ermulig?"
 
 #~ msgid "Invalid Jabber ID"
-#~ msgstr "Ugyldig Jabber ID"
+#~ msgstr "Ugyldig XMPP-ID"
 
 #~ msgid "Neither the remote presence is signed, nor a key was assigned."
-#~ msgstr "Enten er ikke en nøkkel tildelt ellers har ikke kontakten signert."
+#~ msgstr ""
+#~ "Hverken tildeling av nøkkel eller signering motpartens tilstedeværelse er "
+#~ "gjort."
 
 #~ msgid "The contact's key (%s) does not match the key assigned in Gajim."
-#~ msgstr ""
-#~ "Kontaktens nøkkel (%s) passer ikke sammen med nøkkelen tildelt i Gajim."
+#~ msgstr "Kontaktens nøkkel (%s) samsvarer ikke med nøkkelen tildelt i Gajim."
 
+# Should this be '27' instead?
 #~ msgid "[This message is *encrypted* (See :XEP:`27`]"
 #~ msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
 
 #~ msgid "A message from a non-valid JID arrived, it has been ignored."
-#~ msgstr "En melding fra en ikke-gyldig JID ankom, den har blitt ignorert."
+#~ msgstr "En melding fra en ugyldig JID ankom, den har blitt ignorert."
 
 #~ msgid "Database cannot be read."
 #~ msgstr "Databasen kan ikke leses."
@@ -11781,56 +11494,54 @@ msgstr "Registrering feilet"
 #~ "been received by the remote end. If this icon stays\n"
 #~ "for a long time, it's likely the message got lost."
 #~ msgstr ""
-#~ "Dette ikonet indikerer at denne meldingen ikke enda\n"
-#~ "har blitt motatt av andre enden. Dersom dette ikonet\n"
-#~ "vises lenge er det sannsynlig at meldingen ble mistet."
+#~ "Dette miniatyrbildet henspeiler at denne meldingen ikke enda\n"
+#~ "har blitt motatt i andre enden. Dersom dette miniatyrbildet\n"
+#~ "vises lenge er det sannsynlig at meldingen gikk tapt."
 
 #~ msgid "XML Console for %s"
-#~ msgstr "XML Konsoll for %s"
+#~ msgstr "XML-Konsoll for %s"
 
-#, fuzzy
 #~ msgid "Invalid expire value"
-#~ msgstr "Ugyldig Servernavn"
+#~ msgstr "Ugyldig utløpsverdi"
 
-#, fuzzy
 #~ msgid "There is an error"
-#~ msgstr "Tjenesten returnerte en feil."
+#~ msgstr "Det er noe galt"
 
 #~ msgid ""
 #~ "Your chat session with <b>%(jid)s</b> is encrypted.\n"
 #~ "\n"
 #~ "This session's Short Authentication String is <b>%(sas)s</b>."
 #~ msgstr ""
-#~ "Din samtale sesjon med <b>%(jid)s</b> er kryptert.\n"
+#~ "Din samtaleøkt med <b>%(jid)s</b> er kryptert.\n"
 #~ "\n"
-#~ "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
+#~ "Denne øktas korte bekreftelsesstreng er <b>%(sas)s</b>."
 
 #~ msgid "You have already verified this contact's identity."
-#~ msgstr "Du har allerede verifisert denne kontaktens identitet."
+#~ msgstr "Du har allerede bekreftet denne kontaktens identitet."
 
 #~ msgid "Contact's identity verified"
-#~ msgstr "Kontaktens identitet verifisert"
+#~ msgstr "Kontaktens identitet er bekreftet"
 
 #~ msgid "Verify again..."
-#~ msgstr "Verifiser igjen..."
+#~ msgstr "Bekreft igjen…"
 
 #~ msgid ""
 #~ "To be certain that <b>only</b> the expected person can read your messages "
 #~ "or send you messages, you need to verify their identity by clicking the "
 #~ "button below."
 #~ msgstr ""
-#~ "For å være sikker på at <b>bare</b> den forventede personen kan lese dine "
-#~ "meldinger eller sende meldinger, må du verifisere identiteten ved å "
-#~ "klikke på knappen under. "
+#~ "For å være sikker på at <b>bare</b> den forventede personen kan lese "
+#~ "meldingene dine, eller sende deg meldinger, må du bekrefte identiteten "
+#~ "ved å klikke på knappen nedenfor."
 
 #~ msgid "Contact's identity NOT verified"
-#~ msgstr "Kontaktens identitet IKKE verifisert"
+#~ msgstr "Kontaktens identitet er IKKE bekreftet"
 
 #~ msgid "Verify..."
-#~ msgstr "Verifiser..."
+#~ msgstr "Bekreft…"
 
 #~ msgid "Have you verified the contact's identity?"
-#~ msgstr "Har du verifisert kontaktens identitet?"
+#~ msgstr "Har du bekreftet kontaktens identitet?"
 
 #~ msgid ""
 #~ "To prevent talking to an unknown person, you should speak to <b>%(jid)s</"
@@ -11840,131 +11551,126 @@ msgstr "Registrering feilet"
 #~ "This session's Short Authentication String is <b>%(sas)s</b>."
 #~ msgstr ""
 #~ "For å forhindre samtaler med en ukjent person, bør du snakke med <b>"
-#~ "%(jid)s</b> direkte (personlig eller på telefon) og verifisere at de ser "
-#~ "den samme  Short Authentication String (SAS) som du.\n"
+#~ "%(jid)s</b> direkte (personlig eller på telefon) og bekrefte at de ser "
+#~ "samme korte bekreftelsesstreng (SAS) som du.\n"
 #~ "\n"
-#~ "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
+#~ "Denne øktas korte bekreftelsesstreng er <b>%(sas)s</b>."
 
 #~ msgid "Did you talk to the remote contact and verify the SAS?"
-#~ msgstr "Har du snakket med kontakten og verifisert SASen?"
+#~ msgstr "Har du snakket med kontakten og bekreftet SAS-en?"
 
 #~ msgid ""
 #~ "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 #~ msgstr ""
 #~ "Kontaktens nøkkel (%s) <b>passer ikke</b> med nøkkelen tildelt i Gajim."
 
-#, fuzzy
 #~ msgid ""
 #~ "No OpenPGP key is assigned to this contact. So you cannot encrypt "
 #~ "messages."
 #~ msgstr ""
-#~ "Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
+#~ "Ingen OpenPGP-nøkkel tildelt denne kontakten. Så du kan ikke kryptere "
 #~ "meldinger."
 
-#, fuzzy
 #~ msgid ""
 #~ "OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
 #~ "b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to "
 #~ "trust this key."
 #~ msgstr ""
-#~ "GPG nøkkel er tildelt denne kontaken, men du <b>stoler ikke på denne "
-#~ "nøkkelen<b> så meldingen <b>kan ikke</b> bli kryptert. Bruk din GPG "
-#~ "klient for å stole på denne nøkkelen."
+#~ "Det er en OpenPGP-nøkkel tildelt denne kontakten, men <b>du stoler ikke "
+#~ "på vedkommendes nøkkel</b>, så meldingen <b>kan ikke</b> krypteres. Bruk "
+#~ "din OpenPGP-klient for å betro nøkkelen."
 
-#, fuzzy
 #~ msgid ""
 #~ "OpenPGP Key is assigned to this contact, and you trust his key, so "
 #~ "messages will be encrypted."
 #~ msgstr ""
-#~ "GPG nøkkel er tildelt denne kontakten, og du stoler på den, så meldinger "
-#~ "vil bli kryptert."
+#~ "En OpenPGP-nøkkel er tildelt denne kontakten, og du stoler på "
+#~ "vedkommendes nøkkel, så meldinger vil bli kryptert."
 
 #~ msgid "This file is being used by another process."
-#~ msgstr "Denne filen er i bruk av en annen prosess."
+#~ msgstr "Fila er i bruk av en annen prosess."
 
 #~ msgid "pgp key"
-#~ msgstr "pgp nøkkel"
+#~ msgstr "PGP-nøkkel"
 
 #~ msgid ""
 #~ "Sends new single 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 ""
-#~ "Sender ny enkelt melding til en kontakt i kontaktlisten. BÃ¥de OpenPGP "
-#~ "nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', "
-#~ "uten 'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
+#~ "Sender en ny enkeltstående melding til noen på kontaktlista. Både OpenPGP-"
+#~ "nøkkel og konto er valgfritt. Hvis du ønsker å sette bare 'konto'. uten "
+#~ "'OpenPGP-nøkkel'. nare sett 'OpenPGP-nøkkel til ''."
 
-#, fuzzy
 #~ msgid "Please first choose another theme as your current theme."
-#~ msgstr "Vennligst velg en annen for ditt gjeldende tema."
+#~ msgstr "Velg en annen drakt som gjeldende først."
 
 #~ msgid "A non-privacy-related room configuration change has occurred"
-#~ msgstr "En non-privacy-related rom konfigurasjons ending har skjedd"
+#~ msgstr ""
+#~ "En endring ikke relatert til personvern har blitt forekommet for dette "
+#~ "rommet"
 
-#, fuzzy
 #~ msgid "Maximum number of users for <b>%s</b> has been reached"
-#~ msgstr "Maksimum antall brukere for %s er nådd"
+#~ msgstr "<b>%s</b> er fullt"
 
 #~ msgid "Your passphrase is incorrect"
-#~ msgstr "Passord setningen din er ikke riktig"
+#~ msgstr "Feil passord"
 
-#, fuzzy
 #~ msgid "OpenPGP Passphrase Incorrect"
-#~ msgstr "OpenGPG Passordord er ikke riktig"
+#~ msgstr "Feil OpenPGP-passord"
 
-#, fuzzy
 #~ msgid "OpenPGP key not trusted"
-#~ msgstr "GPG nøkkel ikke tiltrodd"
+#~ msgstr "OpenPGP-nøkkelen er ikke betrodd"
 
 #~ msgid "You successfully received %(filename)s from %(name)s."
-#~ msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
+#~ msgstr "Du har mottatt %(filename)s fra %(name)s."
 
 #~ msgid ""
 #~ "Your configured emoticons theme cannot been loaded. You maybe need to "
 #~ "update the format of emoticons.py file. See http://trac.gajim.org/wiki/"
 #~ "Emoticons for more details."
 #~ msgstr ""
-#~ "Ditt konfigurerte følelsesikon tema kunne ikke lastes. Du må kanskje "
-#~ "oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
+#~ "Din oppsatte humørfjes-drakt kan ikke lastes inn. Du trenger kanskje å "
+#~ "oppdatere formatet på emoticons.py.-fila. Se http://trac.gajim.org/wiki/"
 #~ "Emoticons for flere detaljer."
 
-#, fuzzy
 #~ msgid "Set logs directory"
-#~ msgstr "lager %s mappe"
+#~ msgstr "Velg loggføringsmappe"
 
 #~ msgid "Chats"
 #~ msgstr "Samtaler"
 
 #~ msgid "You will be connected to %s without OpenPGP."
-#~ msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
+#~ msgstr "Du vil bli tilsluttet %s uten OpenPGP."
 
 #~ msgid ""
 #~ "By removing this contact you also remove authorization resulting in him "
 #~ "or her always seeing you as offline."
 #~ msgstr ""
-#~ "Ved å fjerne denne kontakten fjerner du også godkjenningen som gjør at "
-#~ "han eller henne alltid vil se deg som frakoblet."
+#~ "Ved å fjerne denne kontakten vil du også fjerne "
+#~ "tilstedeværelsesgodkjenningen slik at vedkommende alltid ser deg som om "
+#~ "du var frakoblet."
 
 #~ msgid "to %s account"
-#~ msgstr "til %s kontoen"
+#~ msgstr "til %s konto"
 
 #~ msgid "using %s account"
-#~ msgstr "på %s kontoen"
+#~ msgstr "bruker %s-kontoen"
 
 #~ msgid "_Manage Bookmarks..."
-#~ msgstr "_Behandle Bokmerker..."
+#~ msgstr "_Behandle bokmerker…"
 
 #~ msgid "of account %s"
-#~ msgstr "for konto %s"
+#~ msgstr "for kontoen %s"
 
 #~ msgid "for account %s"
 #~ msgstr "for kontoen %s"
 
 #~ msgid "Change Status Message..."
-#~ msgstr "Endre Status Melding..."
+#~ msgstr "Endrer statusmelding…"
 
 #~ msgid "_Change Status Message..."
-#~ msgstr "_Endre Status Melding..."
+#~ msgstr "_Endre statusmelding…"
 
 #~ msgid "Last status: %s"
 #~ msgstr "Siste status: %s"
@@ -11979,53 +11685,45 @@ msgstr "Registrering feilet"
 #~ "You are not interested in the contact's presence, and neither he/she is "
 #~ "interested in yours"
 #~ msgstr ""
-#~ "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei "
-#~ "heller han/hun i din."
+#~ "Du og kontakten har sammenfallende manglende interesse for hverandres "
+#~ "tilstedeværelsesinformasjon"
 
 #~ msgid "Error description..."
-#~ msgstr "Feil beskrivelse..."
+#~ msgstr "Feil-beskrivelse…"
 
-#, fuzzy
 #~ msgid "View contact information (Ctrl+I)"
-#~ msgstr "Inviter kontakter til samtalen (Ctrl+G)"
-
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Kontakt navn"
+#~ msgstr "Vis kontaktinformasjon (Ctrl+I)"
 
-#, fuzzy
 #~ msgid "Groupchat Histories"
-#~ msgstr "Gruppesamtaler"
+#~ msgstr "Historikk for gruppesamtaler"
 
-#, fuzzy
 #~ msgid "All Chat Histories"
-#~ msgstr "Gamle historier"
+#~ msgstr "All samtalehistorikk"
 
 #~ msgid "More"
 #~ msgstr "Mer"
 
 #~ msgid "creating %s directory"
-#~ msgstr "lager %s mappe"
+#~ msgstr "lager %s-mappe"
 
 #~ msgid ""
 #~ "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 #~ "account passwords."
 #~ msgstr ""
-#~ "Dersom True vil Gajim bruke KDE Wallet (dersom kwalletcli er "
-#~ "tilgjengelig) til å lagre konto passord."
+#~ "Hvis sant vil Gajim bruke KWallet (dersom kwalletcli er tilgjengelig) til "
+#~ "Ã¥ lagre kontopassord."
 
-#, fuzzy
 #~ msgid "Please check if avahi/bonjour-daemon is running."
-#~ msgstr "Vennligst sjekk om avahi-tjenesten kjører."
+#~ msgstr "Sjekk om avahi/bonjour-nissen kjører."
 
 #~ msgid "%s is not the name of a group chat."
 #~ msgstr "%s er ikke navnet til en gruppesamtale."
 
 #~ msgid "Session Management"
-#~ msgstr "Sesjons Behandling"
+#~ msgstr "Økt-behandling"
 
 #~ msgid "Gajim session is stored on logout and restored on login."
-#~ msgstr "Gajim sesjon er lagret på utlogging og gjenopprettes ved pålogging."
+#~ msgstr "Gajim-økta lagres ved utlogging og gjenopprettes ved pålogging."
 
 #~ msgid "Requires python-gnome2."
 #~ msgstr "Krever python-gnome2."
@@ -12037,35 +11735,31 @@ msgstr "Registrering feilet"
 #~ msgstr "SRV"
 
 #~ msgid "Ability to connect to servers which are using SRV records."
-#~ msgstr "Evne til å koble til servere som bruker SRV records."
+#~ msgstr "Evne til å koble til tjenere som bruker SRV-oppføringer."
 
 #~ msgid "Requires dnsutils."
 #~ msgstr "Krever dnsutils."
 
 #~ msgid "Requires nslookup to use SRV records."
-#~ msgstr "Krever nslookup for å bruke SRV records."
+#~ msgstr "Krever nslookup for å bruke SRV-oppføringer."
 
 #~ msgid "Gajim needs X server to run. Quiting..."
-#~ msgstr "Gajim trenger en X server for å kjøre. Avslutter..."
+#~ msgstr "Gajim er avhengig av at X-tjeneren kjører. Avslutter…"
 
 #~ msgid "importing PyGTK failed: %s"
-#~ msgstr "importering av PyGTK feilet: %s"
+#~ msgstr "importering av PyGTK mislyktes: %s"
 
-#, fuzzy
 #~ msgid "Gajim needs PyGTK 2.22 or above"
-#~ msgstr "Gajim trenger PyGTK 2.12 eller høyere"
+#~ msgstr "Gajim trenger PyGTK 2.22 eller høyere"
 
-#, fuzzy
 #~ msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
-#~ msgstr "Gajim tenger PyGTK 2.12 eller høyere for å kjøre. Avslutter..."
+#~ msgstr "Gajim trenger PyGTK 2.22 eller høyere for å kjøre. Avslutter…"
 
-#, fuzzy
 #~ msgid "Gajim needs GTK 2.22 or above"
-#~ msgstr "Gajim trenger GTK 2.12 eller høyere"
+#~ msgstr "Gajim trenger GTK 2.22 eller høyere"
 
-#, fuzzy
 #~ msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
-#~ msgstr "Gajim trenger GTK 2.12 eller høyere for å kjøre. Avslutter..."
+#~ msgstr "Gajim trenger GTK 2.22 eller høyere for å kjøre. Avslutter…"
 
 #~ msgid "Gajim needs pywin32 to run"
 #~ msgstr "Gajim trenger pywin32 for å kjøre"
@@ -12074,8 +11768,7 @@ msgstr "Registrering feilet"
 #~ "Please make sure that Pywin32 is installed on your system. You can get it "
 #~ "at %s"
 #~ msgstr ""
-#~ "Vennligst pass på at Pywin32 er installert på ditt system. Du kan hente "
-#~ "den på %s"
+#~ "Husk at Pywin32 er installert på ditt system. Du kan hente det på %s"
 
 #~ msgid "Gajim is already running"
 #~ msgstr "Gajim kjører allerede"
@@ -12084,25 +11777,24 @@ msgstr "Registrering feilet"
 #~ "Another instance of Gajim seems to be running\n"
 #~ "Run anyway?"
 #~ msgstr ""
-#~ "En annen instans av Gajim ser ut til å kjøre\n"
-#~ "Start likevel?"
+#~ "Gajim ser ut til å allerede være åpent.\n"
+#~ "Ã…pne likevel?"
 
 #~ msgid "A programming error has been detected"
-#~ msgstr "En programmerings feil har blitt detektert"
+#~ msgstr "En programmeringsfeil har blitt oppdaget"
 
 #~ msgid "Details"
 #~ msgstr "Detaljer"
 
-#, fuzzy
 #~ msgid ""
 #~ "Gnome Keyring is installed but not correctly started (environment "
 #~ "variable probably not correctly set)"
 #~ msgstr ""
-#~ "Gnome Keyring er installert men ikke \t\t\t\tstartet riktig (system "
-#~ "variabel sikkert ikke \t\t\t\tsatt riktig)"
+#~ "Gnome-nøkkelringen er installert men ikke startet opp rett "
+#~ "(miljøvariabelen er antageligvis ikke satt opp på rett vis)"
 
 #~ msgid "Jabber ID: "
-#~ msgstr "Jabber ID:"
+#~ msgstr "XMPP-ID: "
 
 #~ msgid "Resource: "
 #~ msgstr "Ressurs: "
@@ -12110,13 +11802,11 @@ msgstr "Registrering feilet"
 #~ msgid "Subscription: "
 #~ msgstr "Abonnement: "
 
-#, fuzzy
 #~ msgid "Mood: "
-#~ msgstr "Humør:"
+#~ msgstr "Humør: "
 
-#, fuzzy
 #~ msgid "Activity: "
-#~ msgstr "Aktivitet:"
+#~ msgstr "Aktivitet: "
 
 #, fuzzy
 #~ msgid "Gajim Remote"
diff --git a/po/nl.po b/po/nl.po
index 7d1d35a491..79452ee6a2 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -480,32 +480,32 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Afbeelding opslaan als…"
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 msgid "Save _As"
 msgstr "Opslaan _als"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Cliënt:Onbekend"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?OS:Onbekend"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Tijd:Onbekend"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Rol in groepsgesprek:<b>Rol:</b>"
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aansluiting:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
@@ -513,7 +513,7 @@ msgstr ""
 "Dit contact is geïnteresseerd in je aanwezigheidsinformatie, maar jij niet "
 "in zijn/haar aanwezigheid"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
@@ -521,11 +521,11 @@ msgstr ""
 "Je bent geïnteresseerd in de aanwezigheidsinformatie van dit contact, maar "
 "dit is niet wederzijds"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 msgid "The contact and you want to exchange presence information"
 msgstr "Jij en het contact willen aanwezigheidsinformatie uitwisselen"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
@@ -533,15 +533,15 @@ msgstr ""
 "Jij en het contact zijn niet geïnteresseerd in elkaars "
 "aanwezigheidsinformatie"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Er is geen lopend abonneringsverzoek."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " bron met prioriteit "
 
@@ -837,7 +837,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Datum"
 
@@ -847,7 +847,7 @@ msgid "Nickname"
 msgstr "Bijnaam"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Bericht"
 
@@ -1150,6 +1150,10 @@ msgstr "Tenslotte"
 msgid "we would like to thank all the package maintainers."
 msgstr "willen we alle pakketonderhouders bedanken."
 
+#: gajim/dialogs.py:1319
+msgid "Thanks"
+msgstr "Met dank aan"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1285,7 +1289,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Zonder verbinding is het niet mogelijk je contacten te synchroniseren."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Naam"
@@ -1341,27 +1345,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "De wachtwoorden in beide velden moeten identiek zijn."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Contact is ingelogd"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Contact is uitgelogd"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Nieuw bericht"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Nieuw enkel bericht"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Nieuw privébericht"
 
@@ -1394,7 +1398,7 @@ msgid "Groupchat Invitation"
 msgstr "Uitnodiging voor groepsgesprek"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Contact heeft zijn/haar status gewijzigd"
 
@@ -1765,7 +1769,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s is nu bekend als %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s is nu %(status)s"
@@ -2136,6 +2140,7 @@ msgid "_Accept"
 msgstr "_Aanvaarden"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Binnengaan"
 
@@ -2155,7 +2160,7 @@ msgstr "Samengevoegde accounts"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2558,44 +2563,48 @@ msgstr "Geschiedenisbeheer"
 msgid "_Join New Group Chat"
 msgstr "Deelnemen aan n_ieuw groepsgesprek"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 msgid "Show the application's version"
 msgstr "Toepassingsversie weergeven"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 msgid "Show only critical errors"
 msgstr "Alleen kritieke fouten weergeven"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 "Profielbestanden volledig scheiden (zelfs geschiedenisdatabase en plug-ins)"
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr "XML-stanza’s en andere debuginformatie afdrukken"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 msgid "Use defined profile in configuration directory"
 msgstr "Gebruik opgegeven profiel in configuratiemap"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 msgid "Set configuration directory"
 msgstr "Configuratiemap instellen"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr "Logboeksysteem configureren"
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 msgid "Show all warnings"
 msgstr "Alle waarschuwingen weergeven"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
-msgstr "ipython-shell openen"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
+msgstr "IPython-shell openen"
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Toont een venster met de volgende lopende gebeurtenis"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Databasefout"
 
@@ -3193,44 +3202,44 @@ msgstr "Machine gaat slapen"
 msgid "Disconnect from the network"
 msgstr "Netwerkverbinding verbreken"
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Gespreksgeschiedenis van %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Gespreksgeschiedenis"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Schijffout"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Fout: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Fout"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is nu: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is nu: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
@@ -3239,24 +3248,24 @@ msgstr "Onderwerp: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Statusbericht wijzigen…"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "via account %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 msgid "_Manage Bookmarks…"
 msgstr "_Bladwijzers beheren…"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
 msgstr "_Rooster verbergen"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "_Rooster weergeven"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Verberg dit menu"
 
@@ -3388,7 +3397,6 @@ msgid "Re_gister"
 msgstr "Re_gistreren"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "Join"
 msgstr "Lid worden"
 
@@ -3536,15 +3544,15 @@ msgstr "Je staat op het punt meerdere tabbladen te sluiten"
 msgid "Do you really want to close them all?"
 msgstr "Wil je ze echt allemaal sluiten?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 msgid "?Noun:Chats"
 msgstr "?Znw:Gesprekken"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Privégesprekken"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Berichten"
 
@@ -3640,7 +3648,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Fout %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fout bij versturen van %(message)s ( %(error)s )"
@@ -3953,28 +3961,28 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "standaard"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Wachtwoord vereist"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 msgid "OpenPGP key expired"
 msgstr "OpenPGP-sleutel verlopen"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
@@ -3982,11 +3990,11 @@ msgstr ""
 "Je OpenPGP-sleutel is verlopen, je zal verbonden worden met %s zonder "
 "OpenPGP."
 
-#: gajim/gui_interface.py:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Verkeerd wachtwoord"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Voer je OpenPGP-wachtwoord opnieuw in of druk op Annuleren."
 
@@ -4510,43 +4518,35 @@ msgid "show help on command"
 msgstr "toont hulp bij opdracht"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Toont of verbergt roostervenster"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 msgid "?CLI:account"
 msgstr "?CLI:account"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "geef alleen contacten weer van de gegeven account"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Drukt een lijst van geregistreerde accounts af"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 msgid "Changes the status of account(s)"
 msgstr "Verandert de status van de account(s)"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid "?CLI:status"
 msgstr "?CLI:status"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4555,16 +4555,16 @@ msgstr ""
 "invisible (onzichtbaar). Gebruik vorige status van account indien niet "
 "ingesteld"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 msgid "?CLI:message"
 msgstr "?CLI:bericht"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "statusbericht"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4573,19 +4573,19 @@ msgstr ""
 "status van alle accounts te veranderen die synchroniseren met de globale "
 "status"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 msgid "Changes the priority of account(s)"
 msgstr "Verandert de prioriteit van de account(s)"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "?CLI:priority"
 msgstr "?CLI:prioriteit"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "prioriteit die je aan de account wil geven"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4594,7 +4594,7 @@ msgstr ""
 "status van alle accounts te veranderen die synchroniseren met de globale "
 "status"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4604,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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "berichtinhoud"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr "PGP-sleutel"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 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 \"\"."
@@ -4636,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:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "onderwerp"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "berichtonderwerp"
 
 # Kan beter vertaald worden
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Stuurt een nieuw bericht in een groepsgesprek waaraan je deelneemt."
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "JID van het groepsgesprek dat het bericht zal ontvangen"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Haalt gedetailleerde informatie op over een contact"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID van contact"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Haalt gedetailleerde informatie op over een contact"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Naam van de account"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Stuurt een bestand naar een contact"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "bestand"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Bestandspad"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 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:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Toont alle voorkeuren en hun waarden"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Zet waarde van ‘sleutel’ op ‘waarde’."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "sleutel=waarde"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 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 "
 "ingesteld"
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Verwijdert een voorkeursitem"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "sleutel"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "naam van de voorkeur die verwijderd zal worden"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Verwijdert contact van rooster"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Geeft het aantal ongelezen berichten weer"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Verstuurt aangepaste XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "Te versturen XML"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
@@ -4765,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:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr "Avatar veranderen"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr "Te gebruiken afbeelding"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4781,19 +4781,15 @@ msgstr ""
 "Account waarvoor de avatar ingesteld zal worden; indien niet opgegeven, zal "
 "ze voor alle accounts ingesteld worden"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Controleer of Gajim wordt uitgevoerd"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Toont of verbergt het ipython-venster"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Parameter ‘contact_jid’ ontbreekt"
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4802,17 +4798,17 @@ msgstr ""
 "‘%s’ staat niet in je rooster.\n"
 "Geef een account op om het bericht mee te sturen."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Je hebt geen actieve account"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4821,16 +4817,16 @@ msgstr ""
 "Gebruik: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Parameters:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s niet gevonden"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4843,7 +4839,7 @@ msgstr ""
 "\n"
 "Opdracht is een van:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4852,7 +4848,7 @@ msgstr ""
 "Te veel parameters. \n"
 "Voer ‘%(basename)s help %(command)s’ in voor meer informatie"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5027,7 +5023,7 @@ msgstr "Eind van de week"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5037,61 +5033,61 @@ msgstr ""
 "rooster. Gebruik een roosterbeheertoepassing zoals http://jru.jabberstudio."
 "org/ om het te verwijderen"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "afmelding verzocht van %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Groepsgesprek is verwijderd"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 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:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Onbekende SSL-fout: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nieuw enkel bericht van %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nieuw privébericht van groepsgesprek %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Bericht ontvangen van %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nieuw bericht van %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s wijzigde zijn/haar status"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s is ingelogd"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s is uitgelogd"
@@ -6261,11 +6257,11 @@ 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:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "groen"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "kruidenier"
 
@@ -6406,11 +6402,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyaan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "logboekdatabase migreren naar indices"
 
@@ -8030,7 +8026,7 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "Gespreksgeschiedenis"
 
@@ -10215,6 +10211,10 @@ msgstr "Contact verwijderen"
 msgid "Passphrase"
 msgstr "Wachtwoord"
 
+#: gajim/data/gui/history_window.ui:38
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Voer naam/JID van contact of groepsgesprek in"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Zoeken:"
@@ -10227,7 +10227,7 @@ msgstr "Zoeken _in datum"
 msgid "Only searching within selected day"
 msgstr "Zoekt enkel binnen geselecteerde dag"
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 msgid "_Show status changes"
 msgstr "_Statusveranderingen tonen"
 
@@ -10830,6 +10830,12 @@ msgstr "Gespreksgeschiedenis"
 msgid "Plugin manager"
 msgstr "Plug-inbeheer"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Toont of verbergt roostervenster"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Toont of verbergt het ipython-venster"
+
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP-account %s"
 
@@ -11902,10 +11908,6 @@ msgstr "Plug-inbeheer"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Contacten uitnodigen in gesprek (Ctrl+G)"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Contactnaam"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Status: "
diff --git a/po/pl.po b/po/pl.po
index 6a8aa82094..16cd529d43 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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."
@@ -486,33 +486,33 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Zapisz plik jako..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "rozmawiam "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Klient: Nieznany"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Czas: Nieznany"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Grupy:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -521,7 +521,7 @@ msgstr ""
 "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
 "interesujesz siÄ™ jego/jej statusem."
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -530,27 +530,27 @@ msgstr ""
 "JesteÅ› zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
 "jest zainteresowana twoim."
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Oboje jesteście zaintersowani nawzajem swoimi informacjami o statusie"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 #, 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:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Nie ma oczekujących żądań autoryzacji."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
@@ -884,7 +884,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Data"
 
@@ -894,7 +894,7 @@ msgid "Nickname"
 msgstr "Pseudonim"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Wiadomość"
 
@@ -1205,6 +1205,11 @@ msgstr ""
 msgid "we would like to thank all the package maintainers."
 msgstr "I wreszcie, chcielibyśmy podziękować wszystkim opiekunom pakietów."
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Wdzięczny"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1345,7 +1350,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nie możesz zsynchronizować kontaktów przy niektywnym połączeniu."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nazwa"
@@ -1403,27 +1408,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
@@ -1456,7 +1461,7 @@ msgid "Groupchat Invitation"
 msgstr "Zaproszenie na czat"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Kontakt zmienił status"
 
@@ -1820,7 +1825,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s występuje teraz jako %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ma teraz status %(status)s"
@@ -2206,6 +2211,7 @@ msgid "_Accept"
 msgstr "Akceptuj"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Dołącz"
 
@@ -2225,7 +2231,7 @@ msgstr "Połączone konta"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2630,49 +2636,53 @@ msgstr "Historia rozmów"
 msgid "_Join New Group Chat"
 msgstr "_Dołącz do pokoju"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Pokaż ikonę w obszarze powiadomienia:"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Pokaż tylko na liście kontaktów"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Edytor zaawansowanych ustawień"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s błąd konfiguracji"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Configure logging system"
 msgstr "Konfiguruj"
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Pokaż wszystkie oczekujące _zdarzenia"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Pokazuje okno z następną nieprzeczytaną wiadomością"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "BÅ‚Ä…d bazy danych"
 
@@ -3261,44 +3271,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historia rozmowy z %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Historia rozmowy"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "BÅ‚Ä…d zapisu lub odczytu na dysku"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "BÅ‚Ä…d: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Obecny status: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Obecny status: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
@@ -3308,25 +3318,25 @@ msgstr "Temat: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Zmień opis statusu"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "używając konta %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Zarządzaj zakładkami"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
 msgstr "Ukryj _listę kontaktów"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Pokaż _listę kontaktów"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Ukryj to menu"
 
@@ -3460,7 +3470,6 @@ msgid "Re_gister"
 msgstr "Za_rejestruj"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Dołącz"
@@ -3613,16 +3622,16 @@ msgstr "Ty zamierzasz zamknąć wszystkie zakładki"
 msgid "Do you really want to close them all?"
 msgstr "Czy na pewno chcesz zamknąć wszystkie?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Czaty"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Rozmowy prywatne"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Wiadomości"
 
@@ -3718,7 +3727,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "BÅ‚Ä…d %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "błąd przy wysyłaniu %(message)s ( %(error)s )"
@@ -4033,37 +4042,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Nie można zapisać twoich ustawień i opcji"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "domyślny"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Klucz GPG stracił ważność"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Błędne hasło"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
@@ -4629,48 +4638,40 @@ msgid "show help on command"
 msgstr "pokaż pomoc polecenia"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Pokazuje lub ukrywa okno listy kontaktów"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "konto"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "pokaż tylko kontakty z danego konta"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Wypisuje listÄ™ zarejestrowanych kont"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Zmienia status kont lub kont"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "status"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4678,17 +4679,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:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "wiadomość"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "informacja o statusie"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4697,21 +4698,21 @@ msgstr ""
 "zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
 "statusem globalnym"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Zmienia priorytet konta lub kont"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "priorytet"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "priorytet, jaki chcesz nadać"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4720,7 +4721,7 @@ msgstr ""
 "status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
 "statusem globalnym"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4730,30 +4731,30 @@ msgstr ""
 "nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
 "to ustaw 'klucz OpenPGP' na ''."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID osoby, która otrzyma wiadomość"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "zawartość wiadomości"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4763,119 +4764,119 @@ msgstr ""
 "nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
 "to ustaw 'klucz OpenPGP' na ''."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "temat"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "temat wiadomości"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 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:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "JID pokoju, do którego zostanie wysłana wiadomość"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Pobiera szczegółowe informacje o kontakcie"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Pobiera szczegółowe informacje o koncie"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Nazwa konta"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Wysyła plik kontaktowi"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "plik"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Ścieżka do pliku"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 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:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Wypisuje wszystkie opcje i ich wartości"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ustawia wartość 'klucza' na 'wartość'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "klucz=wartość"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Usuwa opcjÄ™"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "klucz"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "nazwa opcji do usunięcia"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Usuwa kontakt z listy kontaktów"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Zwraca liczbę nieprzeczytanych wiadomości"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Wysyła własny XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML do wysłania"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4884,15 +4885,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:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr "Zmień awatar"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr "Obrazek"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4900,19 +4901,15 @@ 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:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Proszę sprawdzić czy Gajim jest uruchomiony."
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Pokazuje lub ukrywa okno iptyhon"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Brak argumentu \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4921,15 +4918,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:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Żadne z twoich kont nie jest aktywne"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4938,16 +4935,16 @@ msgstr ""
 "Użyto: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "Nie znaleziono %s"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4958,7 +4955,7 @@ msgstr ""
 "Użycie: polecenie %s [argument]\n"
 "Gdzie polecenie to jedna z następujący fraz:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4967,7 +4964,7 @@ msgstr ""
 "Za dużo argumentów. \n"
 "Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5144,7 +5141,7 @@ msgstr "Koniec tygodnia"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5154,61 +5151,61 @@ msgstr ""
 "Skorzystaj z narzędzi do zarządzania listą kontaktów, takich jak http://jru."
 "jabberstudio.org/ aby go usunąć"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Prośba o cofnięcie autoryzacji od %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Pokój został usunięty"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "W zamian możesz dołączyć do pokoju %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nieznany błąd SSL: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nowa wiadomość prywatna z pokoju %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmienił status"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s połączył(a) się"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s rozłączył(a) się"
@@ -6337,11 +6334,11 @@ msgstr ""
 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:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "zielony"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "grocery"
 
@@ -6485,11 +6482,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyjan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "indeksowanie archiwum rozmów"
 
@@ -8136,7 +8133,7 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Zapisuj historiÄ™ rozmowy"
 
@@ -10416,6 +10413,11 @@ msgstr "Wyślij kontakty:"
 msgid "Passphrase"
 msgstr "Hasło"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Wpisz JID lub nazwÄ™ kontaktu"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Szukaj"
@@ -10428,7 +10430,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Zapisuj w logach zmiany statusów kontaktów"
@@ -11028,6 +11030,12 @@ msgstr "Ostatnio:"
 msgid "Plugin manager"
 msgstr "Rejestracja nie powiodła się"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Pokazuje lub ukrywa okno listy kontaktów"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Pokazuje lub ukrywa okno iptyhon"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "Konto XMPP %s@%s"
@@ -12095,9 +12103,6 @@ msgstr "Rejestracja nie powiodła się"
 #~ msgid "9"
 #~ msgstr "9"
 
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Wpisz JID lub nazwÄ™ kontaktu"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Pokoje"
diff --git a/po/pt.po b/po/pt.po
index 76e2d63aae..e9afaf123d 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -470,35 +470,35 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Guardar Ficheiro como..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Guardado em: %s"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplicações</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -507,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:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -516,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:393
+#: gajim/vcard.py:396
 #, 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:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -530,15 +530,15 @@ msgid ""
 msgstr ""
 "Você e o contacto estão interessados nas informações de presença um do outro"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
@@ -881,7 +881,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Data:"
 
@@ -892,7 +892,7 @@ msgid "Nickname"
 msgstr "Alcunha:"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Mensagem"
 
@@ -1203,6 +1203,10 @@ msgstr ""
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 
+#: gajim/dialogs.py:1319
+msgid "Thanks"
+msgstr ""
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Miguel Fonseca <miguelcsf@gmail.com>"
@@ -1336,7 +1340,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nome"
@@ -1395,27 +1399,27 @@ 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:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Contacto Entrou"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Nova Mensagem"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Nova Mensagem Instantânea"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Nova Mensagem Privada"
 
@@ -1450,7 +1454,7 @@ msgid "Groupchat Invitation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contacto Saiu"
@@ -1822,7 +1826,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s agora é conhecido como %s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
@@ -2200,6 +2204,7 @@ msgid "_Accept"
 msgstr "Aceitar"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -2221,7 +2226,7 @@ msgstr "Contas fundidas"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 #, fuzzy
@@ -2632,48 +2637,53 @@ msgstr "_Histórico"
 msgid "_Join New Group Chat"
 msgstr "_Entrar num Chat"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Mostrar apenas na _lista"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor de Configuração Avançada"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Configuração da Sala"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Mostrar Todos os _Eventos Pedentes"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+#, 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.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr ""
 
@@ -3277,46 +3287,46 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de Conversas com %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Histórico das Conversas"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 #, fuzzy
 msgid "Disk Error"
 msgstr "Erro:"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Introduza a sua mensagem :"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 #, fuzzy
 msgid "Error"
 msgstr "Erro:"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Estado é agora: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
@@ -3326,26 +3336,26 @@ msgstr "Assunto: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Mudar Mensagem de Estado"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "usando a conta %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Gerir Bookmarks"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "Fora da lista"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Mostrar _Lista de Contactos"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Esconder este menú"
 
@@ -3481,7 +3491,6 @@ msgid "Re_gister"
 msgstr "Re_gistar"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Entrar"
@@ -3638,17 +3647,17 @@ msgstr "Não está ligado ao servidor"
 msgid "Do you really want to close them all?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Chat"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar Conversa"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
@@ -3746,7 +3755,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Introduza a sua mensagem :"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar"
@@ -4038,39 +4047,39 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 #, fuzzy
 msgid "default"
 msgstr "Apagar MOTD"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Encriptação OpenPGP"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 
@@ -4626,49 +4635,40 @@ msgid "show help on command"
 msgstr "mostrar ajuda sobre comando"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Mostra ou esconde a janela principal"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "conta"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "mostrar apenas contactos da conta indicada"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Mostra uma lista de contas registadas"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Muda o estado de uma ou várias contas"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "estado"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4677,17 +4677,17 @@ msgstr ""
 "um de: offline, disponível, livre para conversar, ausente, indisponível, "
 "ocupado, invisível"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "mensagem"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "mensagem de estado:"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4696,22 +4696,22 @@ msgstr ""
 "estado de todas as contas que têm a opção \"sincronizar com estado global\" "
 "activada"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Muda o estado de uma ou várias contas"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "_Prioridade"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Quero _registar uma nova conta"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4721,7 +4721,7 @@ msgstr ""
 "estado de todas as contas que têm a opção \"sincronizar com estado global\" "
 "activada"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4732,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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "conteúdo da mensagem"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4764,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:148
+#: gajim/gajim_remote.py:140
 #, fuzzy
 msgid "subject"
 msgstr "Assunto:"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 #, fuzzy
 msgid "message subject"
 msgstr "Mensagem"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 #, fuzzy
 msgid "Name of the account"
 msgstr "Não tem nenhuma conta activa"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Envia um ficheiro a um contacto"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "Ficheiro"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Localização do ficheiro"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Exibe todas as preferências e os seus valores"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'chave' para 'valor'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "chave=valor"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Apaga um item das preferências"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "chave"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a apagar"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Remove o contacto da lista"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 #, fuzzy
 msgid ""
 "Returns current status message (the global one unless account is specified)"
@@ -4877,56 +4877,51 @@ msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr ""
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 #, fuzzy
 msgid "XML to send"
 msgstr "Consola XML"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Contacto Saiu"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Alcunha não encontrada: %s"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 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:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: gajim/gajim_remote.py:261
-#, fuzzy
-msgid "Shows or hides the ipython window"
-msgstr "Mostra ou esconde a janela principal"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento em falta \"contacto_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4935,31 +4930,31 @@ msgstr ""
 "'%s' não está na sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem"
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Não tem nenhuma conta activa"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4970,7 +4965,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um de:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4979,7 +4974,7 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5164,7 +5159,7 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5174,62 +5169,62 @@ msgstr ""
 "ferramentas de gestão de lista (roster) tais como http://jru.jabberstudio."
 "org/ para o remover."
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "pedido de remoção de subscrição por %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Autorização foi removida"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Mensagem Única de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, 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:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova Mensagem como %s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, fuzzy, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova Mensagem como %s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Mudou de Estado"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Iniciou Sessão"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Terminou Sessão"
@@ -6235,11 +6230,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "green"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "grocery"
 
@@ -6393,11 +6388,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "a criar base de dados dos logs"
@@ -8083,7 +8078,7 @@ msgid "Status:"
 msgstr "Estado:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Histórico das Conversas"
 
@@ -10483,6 +10478,11 @@ msgstr "Contacto:"
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Nome do Contacto"
+
 #: gajim/data/gui/history_window.ui:51
 #, fuzzy
 msgid "Search:"
@@ -10496,7 +10496,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Arquivar mudanças de estado dos contactos"
@@ -11087,6 +11087,13 @@ msgstr "Histórico dos registos"
 msgid "Plugin manager"
 msgstr "Publicação vCard falhou"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Mostra ou esconde a janela principal"
+
+#, fuzzy
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Mostra ou esconde a janela principal"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "para conta %s"
@@ -11783,10 +11790,6 @@ msgstr "Publicação vCard falhou"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "está a prestar atenção à conversa"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Nome do Contacto"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Chat"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3900dc75ac..1eebf49aa8 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -488,33 +488,33 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Salvar imagem como..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Possui "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Tempo:Desconhecido"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Afiliação:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -523,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:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -532,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:393
+#: gajim/vcard.py:396
 #, 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:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -546,16 +546,16 @@ msgid ""
 msgstr ""
 "Você e o contato estão interessados na informação da presença de cada um"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Não há requisições de inscrições pendentes."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
@@ -889,7 +889,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Data:"
 
@@ -899,7 +899,7 @@ msgid "Nickname"
 msgstr "Apelido"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Mensagem"
 
@@ -1212,6 +1212,11 @@ msgstr ""
 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:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Agradecido"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1352,7 +1357,7 @@ 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:2631 gajim/dialogs.py:2702 gajim/dialogs.py:3812
-#: gajim/history_window.py:96 gajim/disco.py:865 gajim/disco.py:1692
+#: gajim/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Nome"
@@ -1409,27 +1414,27 @@ 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:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Nova mensagem"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Nova mensagem"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Enviar mensagem privada"
 
@@ -1462,7 +1467,7 @@ msgid "Groupchat Invitation"
 msgstr "Convite para conferência"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "O contato alterou seu status"
 
@@ -1826,7 +1831,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s agora é conhecido como %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s agora está %(status)s"
@@ -2209,6 +2214,7 @@ msgid "_Accept"
 msgstr "Aceitar"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Ingressar"
 
@@ -2228,7 +2234,7 @@ msgstr "Juntar contas"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2636,48 +2642,52 @@ msgstr "Gerenciador de histórico"
 msgid "_Join New Group Chat"
 msgstr "_Ingressar em uma nova Conferência"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Usar ícone na bandeja (também conhecido por área de notificação)"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Mostre somente na _lista"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor de configurações avançado"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Configuração da sala"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Exibir todos _eventos pendentes"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Exibir uma janela popup com o próximo evento pendente"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Erro na base de dados"
 
@@ -3272,44 +3282,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de conversação com %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Histórico de conversação"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Erro de disco"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Erro: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Erro"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status agora é: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status agora é: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
@@ -3319,26 +3329,26 @@ msgstr "Assunto: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Mudar mensagem de status"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "usando conta %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Gerenciar marcadores"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "na _lista"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Exibir _lista"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Esconder este menu"
 
@@ -3473,7 +3483,6 @@ msgid "Re_gister"
 msgstr "Re_gistrar"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Ingressar"
@@ -3623,16 +3632,16 @@ msgstr "Você está prestes a fechar todas as abas"
 msgid "Do you really want to close them all?"
 msgstr "Você realmente deseja fechar todas?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Conferências"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Conversas privadas"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Mensagens"
 
@@ -3728,7 +3737,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Erro %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar %(message)s ( %(error)s )"
@@ -4046,39 +4055,39 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "padrão"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Frase de acesso é obrigatória"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "A chave GPG expirou"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso errada"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Por favor, reescreva sua frase secreta de GPG ou pressione Cancelar."
@@ -4640,48 +4649,40 @@ msgid "show help on command"
 msgstr "exibir ajuda no comando"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "exibe ou esconder a janela principal"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "conta"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "exibir somente os contatos desta conta"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Imprimir uma lista das contas registradas"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Mudar o status da conta ou contas"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "status"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4689,17 +4690,17 @@ msgid ""
 msgstr ""
 "um desses: desconectado, conectado, bate-papo, inativo, fora, np, invisível "
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "mensagem"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "mensagem de status"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4708,21 +4709,21 @@ msgstr ""
 "status de todas as contas existentes com a opção \"sincronizar com status "
 "global\" marcada"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Mudar a prioridade da conta ou das contas"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "prioridade:"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "prioridade que deseja dar para a conta"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4730,7 +4731,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:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4740,30 +4741,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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contato que irá receber a mensagem"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "conteúdos da mensagem"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4773,121 +4774,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:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "assunto"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "assunto da mensagem"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 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:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "O JID do contato que receberá a mensagem"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Informações detalhadas do contato"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID do contato"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Informações detalhadas do contato"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Enviar arquivo para um contato"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "arquivo"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Caminho do arquivo"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "se especificada, arquivo irá ser enviado usando esta conta"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Lista todas as preferências e seus valores"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ajusta o valor da 'chave' ao 'valor '."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "chave=valor"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Deleta um item de preferência"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "chave"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a ser deletada"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Remover contato da lista"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Retorna o número das mensagens não lidas"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Envia XML personalizado"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML a enviar"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4896,17 +4897,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:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Alterar status"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Apelido a ser usado"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4915,19 +4916,15 @@ msgstr ""
 "A conta em que o XML será enviado; se não estiver especificado, será enviado "
 "para todas as contas"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Checar se o Gajim está rodando"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Exibe ou esconder a janela ipython"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento não informado \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4936,16 +4933,16 @@ msgstr ""
 "'%s' não está em sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Você não tem uma conta ativa"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4954,16 +4951,16 @@ msgstr ""
 "Uso: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4974,7 +4971,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um desses:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4983,7 +4980,7 @@ msgstr ""
 "Muitos argumentos. \n"
 "Digite \"%(basename)s help %(command)s\" para mais informações"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5157,7 +5154,7 @@ msgstr "Fim da semana"
 msgid "Weekend!"
 msgstr "Final de semana!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5167,61 +5164,61 @@ msgstr ""
 "ferramentas de gerência da lista como http://jru.jabberstudio.org/ para "
 "removê-lo"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "remoção de inscrição solicitada por %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "A sala foi excluída"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Você pode entrar nessa sala ao invés: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erro de SSL desconhecido: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova mensagem simples de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova mensagem privada da conferência %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mensagem enviada por %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova mensagem de %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s alterou seu status"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s conectou"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s desconectou"
@@ -6353,11 +6350,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Som a ser tocado quando qualquer mensagem MUC chegar."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "verde"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "mantimento"
 
@@ -6501,11 +6498,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "azul celeste"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "migrando base de dados de registros para índices"
 
@@ -8137,7 +8134,7 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Histórico de conversação"
 
@@ -10438,6 +10435,11 @@ msgstr "Enviar contatos:"
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Nome do contato"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Pesquisar:"
@@ -10450,7 +10452,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Log mudanças de status dos contatos"
@@ -11047,6 +11049,12 @@ msgstr "Recentemente:"
 msgid "Plugin manager"
 msgstr "Falha ao registrar"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "exibe ou esconder a janela principal"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Exibe ou esconder a janela ipython"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "Conta XMPP %s@%s"
@@ -12062,10 +12070,6 @@ msgstr "Falha ao registrar"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Convidar contatos para a conversa (Ctrl+G)"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Nome do contato"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Salas"
diff --git a/po/ru.po b/po/ru.po
index 9c68f8878f..6c5f4bcb39 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -486,33 +486,33 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Сохранить изображение как..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Есть "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Time:Неизвестно"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Роль в групповом чате:<b>Роль:</b>"
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Ранг:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -521,7 +521,7 @@ msgstr ""
 "Этот контакт хочет знать о вашем присутствии, но вам информация о его или её "
 "присутствии не интересна"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -530,27 +530,27 @@ msgstr ""
 "Вам хочется получать информацию о присутствии контакта, но он или она не "
 "заинтересована в вашей."
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Вы и контакт оба желаете знать о присутствии друг друга"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "Вы и контакт оба желаете знать о присутствии друг друга"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы ожидаете ответа контакта на запрос на подписку"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Нет ожидающего запроса на подписку."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
@@ -882,7 +882,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Дата"
 
@@ -892,7 +892,7 @@ msgid "Nickname"
 msgstr "Ник"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Сообщение"
 
@@ -1199,6 +1199,11 @@ msgstr ""
 msgid "we would like to thank all the package maintainers."
 msgstr "И наконец, мы хотели бы поблагодарить всех мейнтейнеров пакетов."
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Благодарный"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1338,7 +1343,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Чтобы объединить контакты, необходимо подключиться к серверу."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Имя"
@@ -1395,27 +1400,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля, должны быть одинаковыми."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Контакт подключился"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Контакт отключился"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Новое сообщение"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Новое одиночное сообщение"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Новое личное сообщение"
 
@@ -1448,7 +1453,7 @@ msgid "Groupchat Invitation"
 msgstr "Приглашение в комнату"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Контакт изменит статус"
 
@@ -1813,7 +1818,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s теперь известен как %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s теперь %(status)s"
@@ -2189,6 +2194,7 @@ msgid "_Accept"
 msgstr "_Принять"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Присоединиться"
 
@@ -2208,7 +2214,7 @@ msgstr "Объединенные учетные записи"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2610,46 +2616,50 @@ msgstr "Менеджер истории"
 msgid "_Join New Group Chat"
 msgstr "_Войти в новую комнату"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Отображать значок в области уведомлений:"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 msgid "Show only critical errors"
 msgstr "показывать только сообщения об ошибках"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "Выводить xml станзы и другую отладочную информацию"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 msgid "Use defined profile in configuration directory"
 msgstr "Использовать определенный профиль из каталога с настройками"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 msgid "Set configuration directory"
 msgstr "Установить каталог загрузки конфигурации"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr "Настройки системы логирования"
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Показать непросмотренные _события"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Показывать окно со следующим непрочитанным сообщением"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Ошибка базы данных"
 
@@ -3239,44 +3249,44 @@ msgstr "Компьютер перешел в спящий режим"
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "История"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Ошибка записи на диск"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s теперь %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Ошибка: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Ошибка"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Статус установлен в: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Статус установлен в: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -3286,25 +3296,25 @@ msgstr "Тема: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Изменить сообщение о статусе"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "используя учетную запись %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Управление закладками"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
 msgstr "Скрыть _ростер"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Показать _ростер"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Скрыть это меню"
 
@@ -3438,7 +3448,6 @@ msgid "Re_gister"
 msgstr "За_регистрироваться"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Присоединиться"
@@ -3590,16 +3599,16 @@ msgstr "Вы собираетесь закрыть несколько вклад
 msgid "Do you really want to close them all?"
 msgstr "Действительно закрыть их всех?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Комнаты"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Личные беседы"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Сообщения"
 
@@ -3696,7 +3705,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Ошибка %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "ошибка при отправке %(message)s ( %(error)s )"
@@ -4002,26 +4011,26 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши установки и настройки"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "По_умолчанию"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Требуется парольная фраза"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Введите пароль для OpenPGP ключа %(keyid)s (аккаунт %(account)s)."
 
-#: gajim/gui_interface.py:2996
+#: gajim/gui_interface.py:2997
 msgid "OpenPGP key expired"
 msgstr "Срок действия ключа OpenPGP истёк"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
@@ -4029,11 +4038,11 @@ msgstr ""
 "Срок действия вашего ключа OpenPGP истёк, вы будете подключены к %s без "
 "использования OpenPGP."
 
-#: gajim/gui_interface.py:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Неверная парольная фраза"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Введите парольную фразу для OpenPGP еще раз или нажмите «Отмена»."
 
@@ -4599,46 +4608,38 @@ msgid "show help on command"
 msgstr "показать помощь по команде"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Скрывает или показывает окно ростера"
-
-#: gajim/gajim_remote.py:93
-msgid "Pops up a window with the next pending event"
-msgstr "Показывать окно со следующим непрочитанным сообщением"
-
-#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Выводит список всех контактов в ростере. Каждый контакт будет в отдельной "
 "строке"
 
-#: 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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 msgid "?CLI:account"
 msgstr "?CLI:учетная запись"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "показывать контакты только для данной учетной записи"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Показывает список зарегистрированных учетных записей"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Изменяет статус учетной записи или записей"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid "?CLI:status"
 msgstr "?CLI:статус"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4646,16 +4647,16 @@ msgstr ""
 "один из: отключен, в сети, готов поболтать, отошел, недоступен, не "
 "беспокоить, невидимка. Если не указано, использовать предыдущий статус."
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 msgid "?CLI:message"
 msgstr "?CLI:сообщение"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "сообщение о статусе"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4664,20 +4665,20 @@ msgstr ""
 "изменить статус всех учетных записей, у которых установлена опция "
 "«синхронизировать с глобальным статусом»"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Изменяет приоритет учетной записи или записей"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "?CLI:priority"
 msgstr "?CLI:приоритет"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "приоритет, который вы хотите назначить для учетной записи"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4686,7 +4687,7 @@ msgstr ""
 "всех учетных записей, у которых установлена опция «синхронизировать с "
 "глобальным статусом»"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4696,31 +4697,31 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "содержимое сообщения"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "если указано, сообщение будет зашифровано с использованием открытого ключа"
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 "если указано, сообщение будет отправлено с использованием этой учетной записи"
 
-#: gajim/gajim_remote.py:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4730,124 +4731,124 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "тема"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "тема сообщения"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Отправляет новые сообщения в комнату, к которой вы присоединились."
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Получает детальную информацию о контакте"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID контакта"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Получает детальную информацию о учетной записи"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Имя учетной записи"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Отправляет контакту файл"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "файл"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Путь до файла"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr ""
 "если указано, файл будет отправлен с использованием этой учетной записи"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Показывает все параметры с их значениями"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Присваивает 'ключу' в 'значение'"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "'ключ' это название параметра, а 'значение' это то, что ему присваивают"
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Удаляет параметр"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "ключ"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "имя параметра, который нужно удалить"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Сохраняет текущее состояние настроек Gajim в файл .config"
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Удаляет контакт из ростера"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "если указано, контакт будет взят из контакт-листа этой учетной записи"
 
-#: gajim/gajim_remote.py:219
+#: gajim/gajim_remote.py:211
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
 "запись)"
 
-#: gajim/gajim_remote.py:226
+#: gajim/gajim_remote.py:218
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущее сообщение о статусе (по умолчанию глобальное, если не "
 "указана учетная запись)"
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Возвращает количество непрочитанных сообщений"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Отправляет произвольный XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "Отправляемый XML"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4856,15 +4857,15 @@ msgstr ""
 "Учётная запись, которой будет отправлен XML. Если не указано, xml будет "
 "послан всем контактам."
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr "Изменить аватар"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr "Использовать картинку"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4872,19 +4873,15 @@ msgstr ""
 "Учётная запись, для которой будет назначен аватар. Если не указано, аватар "
 "будет назначен всем учетным записям."
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Проверить, запущен ли Gajim"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Скрывает или показывает окно ipython"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущен аргумент «JID контакта»"
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4893,15 +4890,15 @@ msgstr ""
 "'%s' не в вашем ростере.\n"
 "Укажите учетную запись для отправки сообщения."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "У вас нет ни одной активной учетной записи"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "По-видимому, Gajim не запущен. Вы не можете использовать gajim-remote."
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4910,16 +4907,16 @@ msgstr ""
 "Использование: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s не найден"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4932,7 +4929,7 @@ msgstr ""
 "\n"
 "Команда одна из:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4941,7 +4938,7 @@ msgstr ""
 "Много аргументов. \n"
 "Наберите «%(basename)s help %(command)s» для справки"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5115,7 +5112,7 @@ msgstr "Конец недели"
 msgid "Weekend!"
 msgstr "Выходные!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5125,61 +5122,61 @@ msgstr ""
 "средство управления ростера, например http://jru.jabberstudio.org/, чтобы "
 "удалить его"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "%s хочет отменить подписку"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Комната была удалена"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Взамен, вы можете присоединиться к комнате: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Неизвестная ошибка SSL: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Новое личное сообщение из комнаты %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s меняет статус"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s подключается"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s отключается"
@@ -6314,11 +6311,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, который нужно проигрывать, когда приходит любое сообщение MUC."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "зеленый"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "овощной"
 
@@ -6459,11 +6456,11 @@ msgstr "%s должен быть файлом, а не директорией"
 msgid "Error: cannot open %s for reading"
 msgstr "Ошибка: не могу открыть %s для чтения"
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "синий"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "переносим журнал на индексы"
 
@@ -8087,7 +8084,7 @@ msgid "Status:"
 msgstr "Статус:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Сохранять историю переписки"
 
@@ -10342,6 +10339,11 @@ msgstr "Контакты для отправки:"
 msgid "Passphrase"
 msgstr "Парольная фраза"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Введите JID или имя контакта"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Поиск:"
@@ -10356,7 +10358,7 @@ msgstr "Выполняется поиск..."
 msgid "Only searching within selected day"
 msgstr "Использовать только выбранные в диалоге предпросмотра снимки."
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 msgid "_Show status changes"
 msgstr "Показывать изменения _статуса"
 
@@ -10944,6 +10946,12 @@ msgstr "Недавно:"
 msgid "Plugin manager"
 msgstr "Ошибка в модуле"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Скрывает или показывает окно ростера"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Скрывает или показывает окно ipython"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP учетная запись %s@%s"
@@ -12078,9 +12086,6 @@ msgstr "Ошибка в модуле"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Введите JID или имя контакта"
-
 #~ msgid "Groupchat Histories"
 #~ msgstr "История конференций"
 
diff --git a/po/sk.po b/po/sk.po
index fdf9508b02..d83ae3d002 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -472,33 +472,33 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Uložiť obrázok ako..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Má"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Klient: Neznámy"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámy"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Čas: Neznámy"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pričlenenie:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -507,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:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -516,26 +516,26 @@ 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:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "JID kontaktu, s ktorým chcete komunikovať"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr ""
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Nie sú tu žiadne čakajúce požiadavky o zapísanie."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " zdroj s prioritou "
 
@@ -869,7 +869,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Dátum"
 
@@ -879,7 +879,7 @@ msgid "Nickname"
 msgstr "Prezývka"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Správa"
 
@@ -1190,6 +1190,11 @@ msgstr ""
 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:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Vďačný"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1326,7 +1331,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez pripojenie nemôžete synchronizovať vaše kontakty."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Meno"
@@ -1383,27 +1388,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Heslá vložené do oboch polí sa musia zhodovať."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Kontakt sa prihlasil"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Kontakt sa odhlásil"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Nová správa"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Nová krátka správa"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Nová súkromná správa"
 
@@ -1436,7 +1441,7 @@ msgid "Groupchat Invitation"
 msgstr "Pozvánka do diskusnej skupiny"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Kontakt zmenil stav"
 
@@ -1799,7 +1804,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je známy ako %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je teraz %(status)s"
@@ -2173,6 +2178,7 @@ msgid "_Accept"
 msgstr "Prijať"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Pripojiť"
 
@@ -2192,7 +2198,7 @@ msgstr "Zlúčené účty"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2594,48 +2600,52 @@ msgstr "Správca histórie"
 msgid "_Join New Group Chat"
 msgstr "_Pripojiť sa k diskusnej skupine"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "_Zobraziť udalosť v zozname"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Editor rozšírenej konfigurácie"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s konfiguračná chyba"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Zobraziť všetky čakajúce _udalosti"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Vyskakovacie okno s ďalšou čakajúcou udalosťou"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Chyba databázy"
 
@@ -3224,44 +3234,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "História konverzácie s %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "História konverzácie"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Chyba disku"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Chyba: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Chyba"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stav je teraz: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stav je teraz: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Predmet: %s\n"
@@ -3271,26 +3281,26 @@ msgstr "Predmet: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Zmeniť správu o stave"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "použiť účet %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Spravovať záložky"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "v _zozname kontaktov"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Zobraziť _zoznam"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Skryť toto menu"
 
@@ -3425,7 +3435,6 @@ msgid "Re_gister"
 msgstr "Re_gistrácia"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Pripojiť"
@@ -3575,16 +3584,16 @@ msgstr "Chystáte sa zavrieť niekoľko kariet"
 msgid "Do you really want to close them all?"
 msgstr "Naozaj chcete zavrieť všetky?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Diskusné skupiny"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Súkromné rozhovory"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Správy"
 
@@ -3678,7 +3687,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Chyba %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
@@ -3992,37 +4001,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "predvolená"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Passfráza je požadovaná"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG kľúč vypršal"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Nesprávna passfráza"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, 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ť."
@@ -4588,48 +4597,40 @@ msgid "show help on command"
 msgstr "ukáž pomocníka pre príkaz"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Zobraziť alebo skryť okno so zoznamom"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "účet"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "zobraziť len kontakty daného účtu"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše zoznam registrovaných účtov"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Zmeniť stav účtu alebo účtov"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "stav"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4638,17 +4639,17 @@ msgstr ""
 "jeden z: odhlásený, prítomný, chat, preč, diskutovať, zaneprázdnený, "
 "neviditeľný"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "správa"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "správa o stave"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4656,21 +4657,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:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Zmení prioritu účtu alebo účtov"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "priorita"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "priorita, ktorú chcete udeliť účtu"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4679,7 +4680,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:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4689,30 +4690,30 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, ktorý prijme správu"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "obsah správy"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4722,121 +4723,121 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "predmet"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "predmet správy"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 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:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Získať podrobné informácie o kontakte"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Získať podrobné informácie o účte"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Názov účtu"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Poslať súbor kontaktu"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "súbor"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Cesta k súboru"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 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:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Výpis všetkých nastavení a ich hodnôt"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastavuje hodnotu 'kľúča' na 'hodnotu'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "kľúč=hodnota"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Odstrániť položku predvoľby"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "kľúč"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "názov nastavenia, ktoré má byť zmazané"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Odstráni kontakt zo zoznamu"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Vráti počet neprečítaných správ"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Odoslať vlastné XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML na odoslanie"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4845,15 +4846,15 @@ msgstr ""
 "Účet na ktorý bude XML odoslané; ak nie je špecifikovaný, XML bude odoslané "
 "všetkým účtom"
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr "Zmeniť avatar"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr "Obrázok, ktorý sa použije"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4862,19 +4863,15 @@ msgstr ""
 "Účet na ktorý bude XML odoslané; ak nie je špecifikovaný, XML bude odoslané "
 "všetkým účtom"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Kontrolovať, či je Gajim spustený"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Zobraziť alebo skryť okno ipython"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Chýbajúci argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4883,15 +4880,15 @@ msgstr ""
 "'%s' nie je vo vašom zozname.\n"
 "Prosím, špecifikujte účet, z ktorého odoslať správu."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Nemáte žiadny aktívny účet"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4900,16 +4897,16 @@ msgstr ""
 "Použitie: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s nenájdený"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4920,7 +4917,7 @@ msgstr ""
 "Použitie: %s príkaz [argumenty]\n"
 "Príkaz je jeden z:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4929,7 +4926,7 @@ msgstr ""
 "Príliš veľa argumentov. \n"
 "Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5103,7 +5100,7 @@ msgstr "Koniec týždňa"
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5113,61 +5110,61 @@ msgstr ""
 "nástroje na správu zoznamu, napríklad: http://jru.jabberstudio.org/ pre jeho "
 "odstránenie"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "požiadavka na odhlásenie od %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Miestnosť bola zničená"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 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:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznáma chyba SSL: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová správa od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, 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:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Správa od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmenil stav"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s sa prihlásil"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s sa odhlásil"
@@ -6217,11 +6214,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Prehrať zvuk keď príde nejaká MUC správa."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "zelená"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "obchod s potravinami"
 
@@ -6365,11 +6362,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "azúrová"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr ""
 
@@ -7996,7 +7993,7 @@ msgid "Status:"
 msgstr "Stav:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "Zaznamenávať históriu k_onverzácie"
 
@@ -10291,6 +10288,11 @@ msgstr "Poslať kontakty:"
 msgid "Passphrase"
 msgstr "Passfráza"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Meno kontaktu"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Hľadať:"
@@ -10303,7 +10305,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Zaznamenať zmenu stavu kontaktu"
@@ -10894,6 +10896,12 @@ msgstr "Posledné:"
 msgid "Plugin manager"
 msgstr "Registrácia zlyhala"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Zobraziť alebo skryť okno so zoznamom"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Zobraziť alebo skryť okno ipython"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP účet %s@%s"
@@ -11819,10 +11827,6 @@ msgstr "Registrácia zlyhala"
 #~ msgid "*"
 #~ msgstr "*"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Meno kontaktu"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Diskuné skupiny"
diff --git a/po/sr.po b/po/sr.po
index 64c070e7fd..b095e0d279 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -474,33 +474,33 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Сними слику као..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Имам "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Клијент:Непознат"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?ОС:Непознат"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Време:Непознато"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Везаност:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -509,7 +509,7 @@ msgstr ""
 "Овај контакт је заинтересован за информације о Вашем присуству, али Вас не "
 "занимају информације о његовом/њеном присуству."
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -518,13 +518,13 @@ msgstr ""
 "Ви сте заинтересовани за информације о присуству неког контакта, али њега/њу "
 "не занима Ваше присуство"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "И Ви и Ваш контакт сте заинтересовани за информације о присуству један другог"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -532,15 +532,15 @@ msgid ""
 msgstr ""
 "И Ви и Ваш контакт сте заинтересовани за информације о присуству један другог"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чекате одговор контакта о Вашем захтеву за претплатом"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Нема захтева за претплатом на чекању."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " ресурс са приоритетом "
 
@@ -872,7 +872,7 @@ msgid "JID"
 msgstr "ЏИД"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Датум"
 
@@ -882,7 +882,7 @@ msgid "Nickname"
 msgstr "Надимак"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Порука"
 
@@ -1196,6 +1196,11 @@ msgstr ""
 "Последње, али не и најмање важно, желели бисмо захвалити свим одржаватељима "
 "пакета"
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Захвалан"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Б. Кокановић. <branko.kokanovic@gmail.com>"
@@ -1333,7 +1338,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Без везе, није могуће синхронизовати контакте."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Име"
@@ -1390,27 +1395,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Лозинке уписане у оба поља морају бити идентичне."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Контакт је на вези"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Контакт је отишао са везе"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Нова Порука"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Нова Самостална Порука"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Нова Приватна Порука"
 
@@ -1443,7 +1448,7 @@ msgid "Groupchat Invitation"
 msgstr "Позив на групни разговор"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Контакт променио статус"
 
@@ -1808,7 +1813,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s је од сада познат као %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s је тренутно %(status)s"
@@ -2190,6 +2195,7 @@ msgid "_Accept"
 msgstr "_Налози"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Придружи се"
 
@@ -2209,7 +2215,7 @@ msgstr "Спојени налози"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2619,48 +2625,52 @@ msgstr "Управник историјатом"
 msgid "_Join New Group Chat"
 msgstr "_Придруживање новом групном разговору"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Прикажи догађај у листи контаката"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Напредна измена конфигурације"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Конфигурација собе"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Прикажи св_е догађаје на чекању"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Искаче прозор са следећим догађајем на чекању"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Грешка са базом података"
 
@@ -3252,44 +3262,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Историјат разговора са %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Историјат разговора"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Грешка при упису на диск"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s је тренутно %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Грешка: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Грешка"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Статус је тренутно: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Статус је тренутно: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -3299,26 +3309,26 @@ msgstr "Тема: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Измени статусну поруку"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "користећи рачун %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Подешавање маркера"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "у _листи контаката"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "_Прикажи листу контаката"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Сакриј овај мени"
 
@@ -3452,7 +3462,6 @@ msgid "Re_gister"
 msgstr "Ре_гистрација"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Придружи се"
@@ -3604,16 +3613,16 @@ msgstr "Затворићете неколико језичака"
 msgid "Do you really want to close them all?"
 msgstr "Да ли заиста желите да их све затворите?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Групни разговори"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Приватни Разговори"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Поруке"
 
@@ -3711,7 +3720,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Грешка %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка приликом слања %(message)s ( %(error)s )"
@@ -4029,37 +4038,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Није могуће чување Ваших подешавања"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "подразумевано"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Лозинка неопходна"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG кључ истекао"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Неисправна лозинка"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Молимо поново укуцајте Вашу GPG лозинку или притисните Одустани"
@@ -4625,48 +4634,40 @@ msgid "show help on command"
 msgstr "прикажи помоћ за команду"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Приказује или скрива прозор листе контаката "
-
-#: gajim/gajim_remote.py:93
-msgid "Pops up a window with the next pending event"
-msgstr "Искаче прозор са следећим догађајем на чекању"
-
-#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Исписује листу свих контаката са листе контаката. Сваки контакт је у "
 "посебној линији"
 
-#: 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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "налог"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "приказује само контакте са овог налога"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Исписује листу регистрованих налога"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Мења статус једног или више налога"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "статус"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4675,17 +4676,17 @@ msgstr ""
 "једно од: није на вези, на вези, прича, одсутан, продужено одсутан, не "
 "узнемиравај, невидљив"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "порука"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "статусна порука"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4694,21 +4695,21 @@ msgstr ""
 "свих налога који имају укључену опцију \"синхронизација са глобалним статусом"
 "\""
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Мења статус једног или више налога"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "приоритет"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "приоритет који желите да дате овом налогу"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4716,7 +4717,7 @@ msgstr ""
 "измена приоритета датог налога. Ако није одређен, мења се статус свих налога "
 "који имају постављену опцију \"синхронизација са глобалним статусом\""
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4726,29 +4727,29 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "Џабер ИД контакта који ће примити поруку"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "садржај поруке"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ако је назначено, порука ће бити шифрована користећи овај јавни кључ"
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr "ако је назначено, порука ће бити послата користећи овај налог"
 
-#: gajim/gajim_remote.py:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4758,120 +4759,120 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "тема"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "тема поруке"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Шаље нову поруку на групни разговор коме сте се придружили."
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "Џабер ИД собе која ће примити поруку"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Даје детаљне информације о контакту"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "Џабер ИД контакта"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Даје детаљне информације о налогу"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Име налога"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Шаље датотеку контакту"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "датотека"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Путања до датотеке"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "ако је назначено, датотека ће бити послата коритећи овај налог"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Приказује сва подешавања и њихове вредности"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Поставља вредност 'кључа' на 'вредност'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "кључ=вредност"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 "'кључ' је име ставке подешавања, 'вредност' је вредност на коју ће се ставка "
 "поставити"
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Брише ставку подешавања"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "кључ"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "име ставке подешавања које ће се брисати"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записује тренутно стање Гајим подешавања у .config датотеку"
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Уклања контакт са листе"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако је назначено, контакт се узима са листе контаката овог налога"
 
-#: gajim/gajim_remote.py:219
+#: gajim/gajim_remote.py:211
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Враћа тренутни статус (глобални ако није назначен налог)"
 
-#: gajim/gajim_remote.py:226
+#: gajim/gajim_remote.py:218
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Враћа тренутну статусну поруку (глобалну ако није назначен налог)"
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Враћа број непрочитаних порука"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Шаље кориснички дефинисан XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML за слање"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4880,17 +4881,17 @@ msgstr ""
 "Налог за који ће бити послан xml ; ако није одређен, xml ће бити послат за "
 "све налоге"
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Измени статус"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Надимак за коришћење"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4899,19 +4900,15 @@ msgstr ""
 "Налог за који ће бити послан xml ; ако није одређен, xml ће бити послат за "
 "све налоге"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Молимо проверите да ли је Гајим покренут"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Приказује или скрива ipython прозор"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Недостаје аргумент \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4920,15 +4917,15 @@ msgstr ""
 "'%s' није на Вашј листи.\n"
 "Молимо одредите налог за слање поруке."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "немате активних рачуна"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Чини се да Гајим не ради. Не можете да користите gajim-remote."
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4937,16 +4934,16 @@ msgstr ""
 "Коришћење: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s није пронађен"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4958,7 +4955,7 @@ msgstr ""
 "  %s наредба [аргументи]\n"
 "Наредба је једна од:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4967,7 +4964,7 @@ msgstr ""
 "Превише аргумената\n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5141,7 +5138,7 @@ msgstr "Крај недеље"
 msgid "Weekend!"
 msgstr "Викенд!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5150,61 +5147,61 @@ msgstr ""
 "Џабер ИД %s не поштује RFC правила. Неће бити додат на Вашу листу контаката. "
 "Употребите алате као што је http://jru.jabberstudio.org/ да бисте га уклонили"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "захтев за укидање претплате од контакта %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Соба групног разговора је уништена"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Можете се прикључити соби %s уместо ове"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Непозната SSL грешка: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Нова самостална порука од контакта %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Нова приватна порука са групног разговора %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Нова порука од %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Нова порука од %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s је променио статус"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s је на вези"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s је отишао"
@@ -6319,11 +6316,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук који ће се пустити када стигне нека MUC порука."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "зелена"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "намирнице"
 
@@ -6467,11 +6464,11 @@ msgstr "%s jе фасцикла, али би требала бити датот
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: није могуће отворити %s за читање"
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "цијан"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "пребацујем базу дневника у индексе"
 
@@ -8098,7 +8095,7 @@ msgid "Status:"
 msgstr "Статус:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Памти у дневнику историјат разговора"
 
@@ -10389,6 +10386,10 @@ msgstr "Послати контакти:"
 msgid "Passphrase"
 msgstr "Лозинка"
 
+#: gajim/data/gui/history_window.ui:38
+msgid "Enter name / JID of contact or groupchat"
+msgstr ""
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Претрага:"
@@ -10401,7 +10402,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Записуј у дневник статусне промене контаката"
@@ -10987,6 +10988,12 @@ msgstr "Недавно:"
 msgid "Plugin manager"
 msgstr "Регистрација неуспела"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Приказује или скрива прозор листе контаката "
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Приказује или скрива ipython прозор"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP налог %s@%s"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 78a1506d65..f706e4fe45 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -481,33 +481,33 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Snimi sliku kao..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Imam "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nepoznat"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Vreme:Nepoznato"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vezanost:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -516,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:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -525,13 +525,13 @@ msgstr ""
 "Vi ste zainteresovani za informacije o prisustvu nekog kontakta, ali njega/"
 "nju ne zanima Vaše prisustvo"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, 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:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -539,15 +539,15 @@ msgid ""
 msgstr ""
 "I Vi i Vaš kontakt ste zainteresovani za informacije o prisustvu jedan drugog"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o Vašem zahtevu za pretplatom"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Nema zahteva za pretplatom na čekanju."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " resurs sa prioritetom "
 
@@ -879,7 +879,7 @@ msgid "JID"
 msgstr "DŽID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Datum"
 
@@ -889,7 +889,7 @@ msgid "Nickname"
 msgstr "Nadimak"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Poruka"
 
@@ -1202,6 +1202,11 @@ msgstr ""
 "Poslednje, ali ne i najmanje važno, želeli bismo zahvaliti svim "
 "održavateljima paketa"
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Zahvalan"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "B. Kokanović. <branko.kokanovic@gmail.com>"
@@ -1337,7 +1342,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze, nije moguće sinhronizovati kontakte."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Ime"
@@ -1394,27 +1399,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Kontakt je na vezi"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Kontakt je otišao sa veze"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Nova Poruka"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Nova Samostalna Poruka"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
@@ -1447,7 +1452,7 @@ msgid "Groupchat Invitation"
 msgstr "Poziv na grupni razgovor"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Kontakt promenio status"
 
@@ -1813,7 +1818,7 @@ 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:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je trenutno %(status)s"
@@ -2196,6 +2201,7 @@ msgid "_Accept"
 msgstr "_Nalozi"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Pridruži se"
 
@@ -2215,7 +2221,7 @@ msgstr "Spojeni nalozi"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2625,48 +2631,52 @@ msgstr "Upravnik istorijatom"
 msgid "_Join New Group Chat"
 msgstr "_Pridruživanje novom grupnom razgovoru"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Notification-daemon"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Prikaži događaj u listi kontakata"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Napredna izmena konfiguracije"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Konfiguracija sobe"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Prikaži sv_e događaje na čekanju"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "Iskače prozor sa sledećim događajem na čekanju"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Greška sa bazom podataka"
 
@@ -3258,44 +3268,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Istorijat razgovora sa %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Istorijat razgovora"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Greška pri upisu na disk"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Greška: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Greška"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status je trenutno: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -3305,26 +3315,26 @@ msgstr "Tema: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Izmeni statusnu poruku"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Podešavanje markera"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "u _listi kontakata"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "_Prikaži listu kontakata"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Sakrij ovaj meni"
 
@@ -3459,7 +3469,6 @@ msgid "Re_gister"
 msgstr "Re_gistracija"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Pridruži se"
@@ -3611,16 +3620,16 @@ msgstr "Zatvorićete nekoliko jezičaka"
 msgid "Do you really want to close them all?"
 msgstr "Da li zaista želite da ih sve zatvorite?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Grupni razgovori"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Privatni Razgovori"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Poruke"
 
@@ -3716,7 +3725,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Greška %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
@@ -4029,37 +4038,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće čuvanje Vaših podešavanja"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "podrazumevano"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Lozinka neophodna"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG ključ istekao"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Neispravna lozinka"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Molimo ponovo ukucajte Vašu GPG lozinku ili pritisnite Odustani"
@@ -4620,48 +4629,40 @@ msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Prikazuje ili skriva prozor liste kontakata "
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "nalog"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "prikazuje samo kontakte sa ovog naloga"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registrovanih naloga"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Menja status jednog ili više naloga"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "status"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
@@ -4670,17 +4671,17 @@ msgstr ""
 "jedno od: nije na vezi, na vezi, priča, odsutan, produženo odsutan, ne "
 "uznemiravaj, nevidljiv"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "poruka"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "statusna poruka"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4689,21 +4690,21 @@ msgstr ""
 "svih naloga koji imaju uključenu opciju \"sinhronizacija sa globalnim "
 "statusom\""
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Menja status jednog ili više naloga"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "prioritet"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "prioritet koji želite da date ovom nalogu"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4711,7 +4712,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:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4721,29 +4722,29 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "Džaber ID kontakta koji će primiti poruku"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "sadržaj poruke"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4753,120 +4754,120 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "tema"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "tema poruke"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 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:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "Džaber ID sobe koja će primiti poruku"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "Džaber ID kontakta"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o nalogu"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Ime naloga"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Å alje datoteku kontaktu"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "datoteka"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Putanja do datoteke"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 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:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Prikazuje sva podešavanja i njihove vrednosti"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrednost 'ključa' na 'vrednost'."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "ključ=vrednost"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Briše stavku podešavanja"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "ključ"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "ime stavke podešavanja koje će se brisati"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Šalje korisnički definisan XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4875,17 +4876,17 @@ msgstr ""
 "Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
 "sve naloge"
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Izmeni status"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Nadimak za korišćenje"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4894,19 +4895,15 @@ msgstr ""
 "Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
 "sve naloge"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Molimo proverite da li je Gajim pokrenut"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Prikazuje ili skriva ipython prozor"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4915,15 +4912,15 @@ msgstr ""
 "'%s' nije na Vašj listi.\n"
 "Molimo odredite nalog za slanje poruke."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4932,16 +4929,16 @@ msgstr ""
 "Korišćenje: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4952,7 +4949,7 @@ msgstr ""
 "Korišćenje: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4961,7 +4958,7 @@ msgstr ""
 "Previše argumenata\n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5135,7 +5132,7 @@ msgstr "Kraj nedelje"
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5145,61 +5142,61 @@ msgstr ""
 "kontakata. Upotrebite alate kao Å¡to je http://jru.jabberstudio.org/ da biste "
 "ga uklonili"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "zahtev za ukidanje pretplate od kontakta %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Soba grupnog razgovora je uništena"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Možete se priključiti sobi %s umesto ove"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova samostalna poruka od kontakta %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova privatna poruka sa grupnog razgovora %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je promenio status"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s je na vezi"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s je otišao"
@@ -6318,11 +6315,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će se pustiti kada stigne neka MUC poruka."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "zelena"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "namirnice"
 
@@ -6466,11 +6463,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cijan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "prebacujem bazu dnevnika u indekse"
 
@@ -8099,7 +8096,7 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Pamti u dnevniku istorijat razgovora"
 
@@ -10399,6 +10396,11 @@ msgstr "Poslati kontakti:"
 msgid "Passphrase"
 msgstr "Lozinka"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Ime kontakta"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Pretraga:"
@@ -10411,7 +10413,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Zapisuj u dnevnik statusne promene kontakata"
@@ -11003,6 +11005,12 @@ msgstr "Nedavno:"
 msgid "Plugin manager"
 msgstr "Registracija neuspela"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Prikazuje ili skriva prozor liste kontakata "
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Prikazuje ili skriva ipython prozor"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP nalog %s@%s"
@@ -12004,10 +12012,6 @@ msgstr "Registracija neuspela"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Pozovi kontakte u konverzaciju (Ctrl+G)"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Ime kontakta"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Grupni razgovori"
diff --git a/po/sv.po b/po/sv.po
index fa440cb0fc..41e0ea5bfa 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -480,33 +480,33 @@ msgstr "Bilden kan inte sparas i %(type)s format. Spara som %(new_filename)s?"
 msgid "Save Image as…"
 msgstr "Spara bild som..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Har "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Klient:Okänd"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?OS:Okänt"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Tid:Okänd"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tillhörighet:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -515,7 +515,7 @@ msgstr ""
 "Denna kontakt är intresserad av din närvaroinformation, men du är inte "
 "intresserad av hans/hennes"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -524,27 +524,27 @@ msgstr ""
 "Du är intresserad av denna kontakts närvaroinformation, men han/hon är inte "
 "intresserad av din"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "Du och kontakten är intresserade av varandras närvaroinformation"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 #, 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:401
+#: gajim/vcard.py:404
 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:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Det finns inga väntande prenumerationsbegäran."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
@@ -877,7 +877,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Datum"
 
@@ -887,7 +887,7 @@ msgid "Nickname"
 msgstr "Smeknamn"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Meddelande"
 
@@ -1196,6 +1196,11 @@ msgstr ""
 msgid "we would like to thank all the package maintainers."
 msgstr "Sist men inte minst vill vi tacka alla anvsraiga paketerare."
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Tacksam"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1338,7 +1343,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan inte synkronisera dina kontakter utan en anslutning."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Namn"
@@ -1395,27 +1400,27 @@ 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:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Kontakten loggade in"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggade Ut"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Nytt Meddelande"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Nytt Enstaka Meddelande"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Skicka Privat Meddelande"
 
@@ -1448,7 +1453,7 @@ msgid "Groupchat Invitation"
 msgstr "Inbjudan till Gruppchatt"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Kontakten ändrade status"
 
@@ -1812,7 +1817,7 @@ 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:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s är nu %(status)s"
@@ -2194,6 +2199,7 @@ msgid "_Accept"
 msgstr "Acceptera"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_GÃ¥ in i"
 
@@ -2213,7 +2219,7 @@ msgstr "Sammanfoga konton"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2622,48 +2628,53 @@ msgstr "Historikhanterare"
 msgid "_Join New Group Chat"
 msgstr "_GÃ¥ in i ny gruppchatt"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Använd _aktivitetsfältet (aka. notifieringsyta)"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Visa enbart i _registret"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Avancerad konfigurationsredigerare"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Rumkonfiguration"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Visa alla väntande _händelser"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+#, fuzzy
+msgid "Pops up a window with the next pending event"
+msgstr "Öppnar ett fönster med nästa olästa meddelande"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Databasfel"
 
@@ -3258,45 +3269,45 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Konversationshistorik med %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Konversationshistorik"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Diskfel"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, 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:487
+#: gajim/history_window.py:557
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Felmeddelande: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 #, fuzzy
 msgid "Error"
 msgstr "Fel."
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status är nu: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status är nu: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
@@ -3306,26 +3317,26 @@ msgstr "Ämne: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Ändra statusmeddelande"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "använder kontot %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Hantera bokmärken"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "i _kontaktlista"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Visa _kontaktlista"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Dölj denna meny"
 
@@ -3460,7 +3471,6 @@ msgid "Re_gister"
 msgstr "Re_gistrera"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_GÃ¥ in i"
@@ -3610,16 +3620,16 @@ msgstr "Du är på väg att stänga flera flikar"
 msgid "Do you really want to close them all?"
 msgstr "Vill du verkligen stänga alla dem?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Gruppchatt"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Privat Chatt"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Meddelanden"
 
@@ -3715,7 +3725,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Fel %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fel vid sändning av %(message)s ( %(error)s )"
@@ -4033,38 +4043,38 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Kunde inte spara dina inställningar"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "standard"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Lösenfras krävs"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG-nyckeln har gått ut"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "Ange ditt GPG-lösenord igen eller tryck på Avbryt."
@@ -4626,66 +4636,57 @@ msgid "show help on command"
 msgstr "visar hjälp för kommando"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Visar eller döljer kontaktlistan"
-
-#: 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: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: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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "konto"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "visa bara kontakter för det givna kontot"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Skriver ut en lista över registrerade konton"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Ändrar status för konto eller konton"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "status"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, 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:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "meddelande"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "statusmeddelande"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4693,22 +4694,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:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Ändrar status för konto eller konton"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "Priori_tet:"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "priority you want to give to the account"
 msgstr "Jag vill _registrera ett nytt konto"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 #, fuzzy
 msgid ""
 "change the priority of the given account. If not specified, change status of "
@@ -4717,7 +4718,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:130
+#: gajim/gajim_remote.py:122
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -4728,30 +4729,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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID för kontakten som kommer ta emot meddelandet"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "meddelandeinnehåll"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 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:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 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:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4761,123 +4762,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:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "ämne"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "meddelandeämne"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 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:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "JID för rummet som kommer ta emot meddelandet"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Hämta detaljerad information om kontakt"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID för kontakten"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Hämtar detaljerad information för kontakt"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Namn för kontot"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Skicka fil till en kontakt"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "fil"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Sökväg"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 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:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Listar alla inställningar och deras värden"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sätter värdet av \"nyckel\" till \"värde\"."
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "nyckel=värde"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, 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:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Tar bort en inställning"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "nyckel"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "namnet på inställningen som skall tas bort"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 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:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Ta bort en kontakt från kontaktlista"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 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:219
+#: gajim/gajim_remote.py:211
 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:226
+#: gajim/gajim_remote.py:218
 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:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Returnerar antalet olästa meddelanden"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Skickar anpassad XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML att skicka"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4886,17 +4887,17 @@ msgstr ""
 "Konto för vilket XML kommer skickas. Om du inte specificerat kommer XML "
 "skickas till alla konton"
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 #, fuzzy
 msgid "Change the avatar"
 msgstr "Ändra status"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 #, fuzzy
 msgid "Picture to use"
 msgstr "Smeknamn att använda"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 #, fuzzy
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
@@ -4905,19 +4906,15 @@ msgstr ""
 "Konto för vilket XML kommer skickas. Om du inte specificerat kommer XML "
 "skickas till alla konton"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Kontrollera om Gajim är igång"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Visar eller döljer ipython-fönstret"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Saknar argument \"contact_jid\""
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4926,17 +4923,17 @@ msgstr ""
 "\"%s\" finns inte i din kontaktlista.\n"
 "Ange konto för att skicka meddelandet."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "Du har inget aktivt konto"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 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:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4945,16 +4942,16 @@ msgstr ""
 "Användning: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Parametrar:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s kunde inte hittas"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4965,7 +4962,7 @@ msgstr ""
 "Användning: %s kommando [parametrar]\n"
 "Kommando är en av:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4974,7 +4971,7 @@ msgstr ""
 "För många argument. \n"
 "Skriv \"%(basename)s help %(command)s\" för mer information"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5148,7 +5145,7 @@ msgstr "Slutet av veckan"
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5158,62 +5155,62 @@ msgstr ""
 "kontaktlista. Använd kontakthanteringsverktyg såsom http://jru.jabberstudio."
 "org/  för att ta bort det"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "avprenumerationsförfrågan från %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Auktorisering har tagits bort"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 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:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Okänt SSL-fel: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nytt meddelande från %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nytt privat meddelande från gruppchatten %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Skickat av %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nytt meddelande från %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ändrade status"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s loggade in"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s loggade ut"
@@ -6252,11 +6249,11 @@ msgstr ""
 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:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "green"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "grocery"
 
@@ -6400,11 +6397,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:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "cyan"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "migrerar loggdatabas till index"
 
@@ -8032,7 +8029,7 @@ msgid "Status:"
 msgstr "Status:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Logga konversationshistorik"
 
@@ -10326,6 +10323,11 @@ msgstr "Bjud in _kontakter"
 msgid "Passphrase"
 msgstr "Lösenfras"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Kontaktnamn"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Sök:"
@@ -10338,7 +10340,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "_Logga statusändringar för kontakter"
@@ -10931,6 +10933,12 @@ msgstr "Logghistorik"
 msgid "Plugin manager"
 msgstr "Registreringen misslyckades"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Visar eller döljer kontaktlistan"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Visar eller döljer ipython-fönstret"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP-kontot %s@%s"
@@ -11854,10 +11862,6 @@ msgstr "Registreringen misslyckades"
 #~ msgid "View contact information (Ctrl+I)"
 #~ msgstr "Bjud in kontakter till konversationen (Ctrl+G)"
 
-#, fuzzy
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Kontaktnamn"
-
 #, fuzzy
 #~ msgid "Groupchat Histories"
 #~ msgstr "Gruppchattar"
diff --git a/po/tr.po b/po/tr.po
index 3e857df240..14a48dad10 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -480,64 +480,64 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Resimi Farklı Kaydet..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Sahip"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Client:Bilinmez"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?OS:Unknown?OS:Bilinmez"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Time:Bilinmez"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr ""
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "üyelik değişti"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr ""
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr ""
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr ""
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "Bekleyen üyelemek soru yok."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 #, fuzzy
 msgid " resource with priority "
 msgstr "Beni bir açılan pencereyle _haberle"
@@ -880,7 +880,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Tarih"
 
@@ -890,7 +890,7 @@ msgid "Nickname"
 msgstr "Takma ad"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Ä°leti"
 
@@ -1200,6 +1200,11 @@ msgstr ""
 msgid "we would like to thank all the package maintainers."
 msgstr ""
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Şükreden"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1331,7 +1336,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bağlantızıs kişisel ilanlar sayfayı yazımlayanmiyor"
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Adı"
@@ -1392,27 +1397,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr ""
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Bağlantı Giriş Yaptı"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Bağlantı Çıkış Yaptı"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Yeni Mesaj"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Yeni Tek Ä°leti"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Yeni kiÅŸisel Mesaj"
 
@@ -1445,7 +1450,7 @@ msgid "Groupchat Invitation"
 msgstr "Grup Sohbeti Daveti"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Bağlantı Durumunu Değiştirdi"
 
@@ -1810,7 +1815,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr ""
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s durumu ÅŸimdi %(status)s"
@@ -2181,6 +2186,7 @@ msgid "_Accept"
 msgstr ""
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "_Katıl"
 
@@ -2201,7 +2207,7 @@ msgstr "Hesapları bir_leştir"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2586,47 +2592,51 @@ msgstr "Paket Yöneticisi"
 msgid "_Join New Group Chat"
 msgstr "Yeni grup sohbete _katıl"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 msgid "Show the application's version"
 msgstr ""
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Kişi listesindeki olayları göster"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "İlerlemiş Ayarlama Editörü"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "Hata açıklaması…"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Bütün Bekleyen _Olayları Göster"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
+msgstr ""
+
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 #, fuzzy
 msgid "Database Error"
 msgstr "Hata açıklaması…"
@@ -3234,45 +3244,45 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, fuzzy, python-format
 msgid "Conversation History with %s"
 msgstr "Beni bir açılan pencereyle _haberle"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Sohbet Kayıtları"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 #, fuzzy
 msgid "Disk Error"
 msgstr "Hata açıklaması…"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Hata: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Hata"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "%(nick)s durumu ÅŸimdi %(status)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "%(nick)s durumu ÅŸimdi %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Konu: %s\n"
@@ -3282,26 +3292,26 @@ msgstr "Konu: %s\n"
 msgid "_Change Status Message…"
 msgstr "Durum ileti deÄŸiÅŸtir"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "%s hesapı kullanıp"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Yer imlerini iÅŸlet"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 #, fuzzy
 msgid "Hide _Roster"
 msgstr "<b>Kişi Listesi Görünümü</b>"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Kişi Listesini Göster"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Menüyi gizle"
 
@@ -3432,7 +3442,6 @@ msgid "Re_gister"
 msgstr "_Kaydol"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "_Katıl"
@@ -3584,16 +3593,16 @@ msgstr ""
 msgid "Do you really want to close them all?"
 msgstr "Tüm yer imlerini kaldırmak istediğinizden emin misiniz?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Grup Sohbetler"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "KiÅŸisel Sohbetler"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Ä°letler"
 
@@ -3688,7 +3697,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Hata %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "Kişisel ilet gönderimi başarısız"
@@ -3981,37 +3990,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr ""
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "öntanımlı"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Åžifre gerekli"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 
-#: gajim/gui_interface.py:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "Bu anahtarın kullanım süresi dolmuş"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr ""
 
-#: gajim/gui_interface.py:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Yanlış Şifre"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 
@@ -4584,283 +4593,271 @@ msgid "show help on command"
 msgstr "komut yardımını göster"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr ""
-
-#: gajim/gajim_remote.py:93
-msgid "Pops up a window with the next pending event"
-msgstr ""
-
-#: gajim/gajim_remote.py:97
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 
-#: 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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "hesap"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "sadece bu hesapın kişilerini göster"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Durum satırı okunamadı"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "durum"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
 msgstr ""
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "mesaj"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "durum ileti"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 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:120
+#: gajim/gajim_remote.py:112
 msgid "Changes the priority of account(s)"
 msgstr ""
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "öncelik"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr ""
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 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:130
+#: gajim/gajim_remote.py:122
 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:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr ""
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "iletinin içindekiler"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: gajim/gajim_remote.py:143
+#: gajim/gajim_remote.py:135
 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:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "konu"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "iletinin konusu"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr ""
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr ""
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "KiÅŸinin JIDsi"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr ""
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Hesapın ismi"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Dosyayı bir kişiye gönderir"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "dosya"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Dosya yolu"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr ""
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr ""
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "'key'in deÄŸerini 'value' deÄŸere kurar"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "anahtar=deÄŸer"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr ""
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 #, fuzzy
 msgid "Deletes a preference item"
 msgstr "Günün İletisini Sil"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "anahtar"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 #, fuzzy
 msgid "name of the preference to be deleted"
 msgstr "Lütfen eklemek istediğiniz grubun adını girin."
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "KiÅŸiyi listeden sil"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: gajim/gajim_remote.py:219
+#: gajim/gajim_remote.py:211
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 
-#: gajim/gajim_remote.py:226
+#: gajim/gajim_remote.py:218
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Kaç okunmamış ileti sayısını geri ver"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Özel XML gönder"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "gönderilenecek XML"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
 "all accounts"
 msgstr ""
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr "Avatarı değiştir"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr "Kullanılacak resim"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 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:257
+#: gajim/gajim_remote.py:249
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Paket sisteminin kilitli olup olmadığını kontrol edin."
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr ""
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 #, fuzzy
 msgid "Missing argument \"contact_jid\""
 msgstr "JID veya Kişi adı girdir"
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 #, fuzzy
 msgid "You have no active account"
 msgstr "Bir hesap seçmek zorundasınız."
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, fuzzy, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4869,16 +4866,16 @@ msgstr ""
 "Kullanım: %s [komut satır yordamları reddedildi]\n"
 "  veya:  %s OPTION\n"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Argümanlar:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s bulunamadı"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4887,14 +4884,14 @@ msgid ""
 "Command is one of:\n"
 msgstr ""
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5072,68 +5069,68 @@ msgstr "Ayrıştırmayı bitir"
 msgid "Weekend!"
 msgstr "Hafta sonu!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, 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 ""
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "%s tarafından abonelikten çıkma isteği"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Oda imha edildi"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "<b>Bir hata oluÅŸtu:</b>"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "\"%s\"den yeni bir ileti aldın"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr ""
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "%(nickname)s yazdı"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "%(nickname)s den Yeni İlet alındı"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Durumu deÄŸiÅŸtirdi"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Girdi"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Çıktı"
@@ -6110,11 +6107,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "yeÅŸil"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "bakkal"
 
@@ -6267,12 +6264,12 @@ msgstr ""
 msgid "Error: cannot open %s for reading"
 msgstr "Hata: %s okumak için açılamıyor"
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 #, fuzzy
 msgid "cyan"
 msgstr "turkuaz"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr ""
 
@@ -7941,7 +7938,7 @@ msgid "Status:"
 msgstr "Durum:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "Sohbet kayıtı _kaydet"
 
@@ -10188,6 +10185,11 @@ msgstr "KiÅŸileri eÅŸzamana getir"
 msgid "Passphrase"
 msgstr "Åžifre"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "JID veya Kişi adı girdir"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Ara:"
@@ -10200,7 +10202,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "Tüm _durum değişikliklerini sistem günlüğüne kaydet"
@@ -11471,9 +11473,6 @@ msgstr "Bağlantı Kurulamıyor"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "JID veya Kişi adı girdir"
-
 #~ msgid "All Chat Histories"
 #~ msgstr "Bütün Sohbet Kayıtları"
 
diff --git a/po/uk.po b/po/uk.po
index 58174b23ab..4a26be5a62 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -484,33 +484,33 @@ msgstr ""
 msgid "Save Image as…"
 msgstr "Зберегти зображення як..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "Має "
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "?Клієнт:Невідомий"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "?ОС:Невідома"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "?Час:Невідомий"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Роль в груповій балачці:<b>Роль:</b>"
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Належність:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
@@ -519,7 +519,7 @@ msgstr ""
 "Цей контакт зацікавлений у ваших відомостях щодо присутності, але ви не "
 "цікавитеся відомостями щодо його або її присутності"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
@@ -528,14 +528,14 @@ msgstr ""
 "Ви зацікавлені у відомостях щодо присутності контакту, але він або вона не "
 "цікавляться вашими відомостями"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr ""
 "Ви і цей контакт взаємно зацікавлені у відомостях щодо присутності одне "
 "одного"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
@@ -544,15 +544,15 @@ msgstr ""
 "Ви і цей контакт взаємно зацікавлені у відомостях щодо присутності одне "
 "одного"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Ви очікуєте на відповідь контакту на ваш запит щодо підписки"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "У черзі немає запитів на підписку."
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr " пріоритетний ресурс"
 
@@ -884,7 +884,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "Дата"
 
@@ -894,7 +894,7 @@ msgid "Nickname"
 msgstr "Псевдонім"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "Повідомлення"
 
@@ -1207,6 +1207,11 @@ msgstr ""
 "Нарешті, але ані трохи не менше, ми вдячні всім супровідникам пакунків з "
 "програмою."
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "Вдячний"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr "Сергій Єгоров <prapor@unixzone.org.ua> Юрій Чорноіван (0.12)"
@@ -1344,7 +1349,7 @@ msgstr ""
 "запису з сервером."
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "Назва"
@@ -1403,27 +1408,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі, введені у обидва поля, мають бути тотожними."
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "Контакт увійшов до мережі"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "Контакт вийшов з мережі"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "Нове повідомлення"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "Створити окреме повідомлення"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "Нове конфіденційне повідомлення"
 
@@ -1456,7 +1461,7 @@ msgid "Groupchat Invitation"
 msgstr "Запрошення до групової балачки"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "Зміна контактом стану"
 
@@ -1838,7 +1843,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s тепер стає %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s тепер %(status)s"
@@ -2216,6 +2221,7 @@ msgid "_Accept"
 msgstr "_Прийняти"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "При_єднатися"
 
@@ -2235,7 +2241,7 @@ msgstr "Об’єднані облікові записи"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2638,46 +2644,51 @@ msgstr "Керування журналом"
 msgid "_Join New Group Chat"
 msgstr "_Приєднатись до нової групової балачки"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "Показувати піктограму зони сповіщень"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 msgid "Show only critical errors"
 msgstr "_Показати лише критичні помилки"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 #, fuzzy
 msgid "Print XML stanzas and other debug information"
 msgstr "Показувати повідомлення xml та іншу відлагоджувальну інформацію"
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 msgid "Use defined profile in configuration directory"
 msgstr "Використовувати призначений профіль у каталозі налаштувань"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 msgid "Set configuration directory"
 msgstr "Призначити конфігураційний каталог"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr "Налаштувати ведення журналів"
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "Показати усі _події з черги"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
+msgstr ""
+
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
 msgstr ""
+"Відкриває контекстне вікно з повідомленням про наступну заплановану подію"
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "Помилка бази даних"
 
@@ -3266,44 +3277,44 @@ msgstr "Комп’ютер присипляється"
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Журнал спілкування з %s"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "Журнал спілкування"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "Помилка роботи з диском"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s тепер %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "Помилка: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "Помилка."
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Поточний стан: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Поточний стан: %(status)s"
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -3313,25 +3324,25 @@ msgstr "Тема: %s\n"
 msgid "_Change Status Message…"
 msgstr "_Змінити повідомлення про стан"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "з облікового запису %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "Керування закладками"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
 msgstr "Сховати реєстр"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "Показати _реєстр"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "Сховати це меню"
 
@@ -3465,7 +3476,6 @@ msgid "Re_gister"
 msgstr "За_реєструватися"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "При_єднатися"
@@ -3619,16 +3629,16 @@ msgstr "Ви збираєтесь закрити кілька вкладок"
 msgid "Do you really want to close them all?"
 msgstr "Ви справді бажаєте закритити їх усі?"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "Групові балачки"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "Конфіденційні балачки"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "Повідомлення"
 
@@ -3727,7 +3737,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "Помилка %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "помилка під час надсилання %(message)s ( %(error)s )"
@@ -4039,36 +4049,36 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "Не вдалося зберегти ваші налаштування і параметри"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "типовий"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "Слід вказати пароль"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 msgid "OpenPGP key expired"
 msgstr "GPG ключ застарів"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ваш ключ GPG застарів. З’єднання з %s буде встановлено без OpenPGP."
 
-#: gajim/gui_interface.py:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "Вказано помилковий пароль"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 "Будь ласка, введіть ще раз свій пароль GPG або натисніть кнопку «Скасувати»."
@@ -4641,47 +4651,38 @@ msgid "show help on command"
 msgstr "показати довідку щодо команди"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "Вмикає або вимикає показ вікна реєстру"
-
-#: gajim/gajim_remote.py:93
-msgid "Pops up a window with the next pending event"
-msgstr ""
-"Відкриває контекстне вікно з повідомленням про наступну заплановану подію"
-
-#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr ""
 "Показує список всіх контактів з реєстру. Кожен з записів контактів буде "
 "показано у окремому рядку"
 
-#: 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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 msgid "?CLI:account"
 msgstr "?CLI:обліковий запис"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "показати лише контакти вказаного облікового запису"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "Показує список зареєстрованих облікових записів"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "Змінює стан облікового запису або обліковий запис"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid "?CLI:status"
 msgstr "?CLI:стан"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4690,16 +4691,16 @@ msgstr ""
 "турбувати, невидимий. Якщо не вказано, буде використано попередній стан "
 "облікового запису."
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 msgid "?CLI:message"
 msgstr "?CLI:повідомлення"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "повідомлення про стан"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4708,20 +4709,20 @@ msgstr ""
 "вказано, спробувати змінити стан всіх облікових записів, для яких було "
 "позначено пункт «синхронізувати з загальним станом»"
 
-#: gajim/gajim_remote.py:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "Змінює пріоритет одного або кількох облікових записів"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "?CLI:priority"
 msgstr "?CLI:пріоритет"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "пріоритет який ви бажаєте надати обліковому запису"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4730,7 +4731,7 @@ msgstr ""
 "не вказано, спробувати змінити стан всіх облікових записів, для яких було "
 "позначено пункт «синхронізувати з загальним станом»"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4741,29 +4742,29 @@ msgstr ""
 "встановити лише 'account', без 'OpenPGP key', просто встановіть значення "
 "'OpenPGP key' рівним ''."
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакту, який отримає це повідомлення"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "вміст повідомлення"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "якщо вказано, повідомлення буде зашифровано відкритим ключем"
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr "якщо вказано, повідомлення буде надіслано з цього облікового запису"
 
-#: gajim/gajim_remote.py:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4774,124 +4775,124 @@ msgstr ""
 "встановити лише 'account', без 'OpenPGP key', просто встановіть значення "
 "'OpenPGP key' рівним ''."
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "тема"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "тема повідомлення"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 "Надсилає нове повідомлення до групової балачки, до якої ви приєдналися."
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "JID кімнати, де буде отримано це повідомлення"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Отримує докладні відомості щодо контакту"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "JID контакту"
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Отримує докладні відомості щодо контакту"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "Назва облікового запису"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "Надсилає контакту файл"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "файл"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "Шлях до файла"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "якщо вказано, файл буде надіслано з цього облікового запису"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Показує список всі параметрів та значення цих параметрів"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Встановлює значення «ключ» у «значення»"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "ключ=значення"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "«ключ» — це назва параметра, «значення» — значення параметра"
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "Вилучає запис параметра"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "ключ"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "назва параметра, який буде вилучено"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записує поточні значення параметрів Gajim до файла .config"
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "Вилучає контакт з реєстру"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "якщо вказано, контакт буде взято зі списку контактів цього облікового запису"
 
-#: gajim/gajim_remote.py:219
+#: gajim/gajim_remote.py:211
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Повертає поточний стан (загальний стан, якщо не було вказано облікового "
 "запису)"
 
-#: gajim/gajim_remote.py:226
+#: gajim/gajim_remote.py:218
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Повертає поточне повідомлення стану (загальне повідомлення, якщо не було "
 "вказано облікового запису)"
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "Повертає кількість непрочитаних повідомлень"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "Надсилає нетиповий XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "XML для надсилання"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, fuzzy
 msgid ""
 "Account to which the XML will be sent; if not specified, XML will be sent to "
@@ -4900,15 +4901,15 @@ msgstr ""
 "Обліковий запис, на який буде надіслано xml; якщо не вказано, xml буде "
 "надіслано до всіх облікових записів"
 
-#: gajim/gajim_remote.py:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr "Змінити аватар"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr "Картинка, яку слід використовувати"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
@@ -4916,19 +4917,15 @@ msgstr ""
 "Обліковий запис, на для якого буде встановлено аватар; якщо не вказано, "
 "аватар буде встановлено до всіх облікових записів"
 
-#: gajim/gajim_remote.py:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "Перевірити, чи запущено Gajim"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "Показує або ховає вікно ipython"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущено аргумент «contact_jid»"
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4937,16 +4934,16 @@ msgstr ""
 "«%s» немає у реєстрі.\n"
 "Будь ласка, вкажіть обліковий запис для надсилання цього повідомлення."
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "У вас немає жодного задіяного облікового запису"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Здається, Gajim не запущено. Отже ви не зможете скористатися gajim-remote."
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4955,16 +4952,16 @@ msgstr ""
 "Використання: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr "%s не знайдено"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, python-format
 msgid ""
 "Usage:\n"
@@ -4975,7 +4972,7 @@ msgstr ""
 "Використання: %s команда [аргументи]\n"
 "Можливі команди:\n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4984,7 +4981,7 @@ msgstr ""
 "Забагато аргументів. \n"
 "Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5158,7 +5155,7 @@ msgstr "Кінець тижня"
 msgid "Weekend!"
 msgstr "Вихідні!"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5168,61 +5165,61 @@ msgstr ""
 "Скористайтеся інструментами для керування реєстром, наприклад, http://jru."
 "jabberstudio.org/ для його вилучення"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запит на скасування підписки від %s"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "Кімнату було знищено"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Ви можете приєднатися замість цієї кімнати до %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Невідома помилка SSL: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Нове окреме повідомлення від %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Нове конфіденційне повідомлення з групової балачки %s"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Повідомлення надіслано від імені %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Нове повідомлення від %(nickname)s"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s змінив стан"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s в мережі"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s вийшов з мережі"
@@ -6400,11 +6397,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, який буде відтворено за появи повідомлення групової балачки."
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "зелений"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "овочевий"
 
@@ -6545,11 +6542,11 @@ msgstr "%s є каталогом, а має бути файлом"
 msgid "Error: cannot open %s for reading"
 msgstr "Помилка: не вдалося відкрити %s для читання"
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "блакитний"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "перехід від бази даних журналів до покажчика"
 
@@ -8179,7 +8176,7 @@ msgid "Status:"
 msgstr "Стан:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "_Зберігати журнал спілкування"
 
@@ -10438,6 +10435,11 @@ msgstr "Надіслати контакти:"
 msgid "Passphrase"
 msgstr "Пароль"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "Введіть JID або ім’я контакту"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "Пошук:"
@@ -10451,7 +10453,7 @@ msgstr "_Пошук по даті"
 msgid "Only searching within selected day"
 msgstr "Шукати лише у зазначений день"
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 msgid "_Show status changes"
 msgstr "_Показати зміни стану"
 
@@ -11043,6 +11045,12 @@ msgstr "Нещодавно:"
 msgid "Plugin manager"
 msgstr "Активація додатка невдалаДодаток"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "Вмикає або вимикає показ вікна реєстру"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "Показує або ховає вікно ipython"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "облікового запису %s@%s"
@@ -12183,9 +12191,6 @@ msgstr "Активація додатка невдалаДодаток"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "Введіть JID або ім’я контакту"
-
 #~ msgid "Groupchat Histories"
 #~ msgstr "Історія групових балачок"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 013993f940..6cf1d64b3f 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -476,67 +476,67 @@ msgstr "图片不能被保存为 %(type)s 格式。保存为 %(new_filename)s?"
 msgid "Save Image as…"
 msgstr "图片另存为..."
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "有"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "未知"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "未知"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "未知"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Role in Group Chat:<b>角色</b>"
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>归属: </b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr "此联系人对您的状态信息感兴趣, 但您不关心他/她的状态"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr "您对此联系人的状态信息感兴趣, 但他/她不关心您的状态"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "没有未处理的认证请求"
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr "带有优先级的资源"
 
@@ -870,7 +870,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "日期"
 
@@ -880,7 +880,7 @@ msgid "Nickname"
 msgstr "昵称"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "消息"
 
@@ -1182,6 +1182,11 @@ msgstr ""
 msgid "we would like to thank all the package maintainers."
 msgstr "最后但不是最不重要的, 我们要感谢所有的软件包维护者。"
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "æ„Ÿæ¿€"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1319,7 +1324,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "未连接时, 您不能同步您的联系人。"
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "名称"
@@ -1376,27 +1381,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "在两个输入框中输入的密码必须一致。"
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "联系人登录"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "联系人退出登录"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "新消息"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "新单条消息"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "新个人消息"
 
@@ -1429,7 +1434,7 @@ msgid "Groupchat Invitation"
 msgstr "多人聊天邀请"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "联系人状态改变"
 
@@ -1785,7 +1790,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s 现在成了 %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s 的状态是 %(status)s"
@@ -2161,6 +2166,7 @@ msgid "_Accept"
 msgstr "帐户(_A)"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "加入(_J)"
 
@@ -2180,7 +2186,7 @@ msgstr "已合并的帐户"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2566,48 +2572,52 @@ msgstr "历史记录管理器"
 msgid "_Join New Group Chat"
 msgstr "加入新的聊天室(_J)"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "在通知区域显示图标: "
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "只显示在联系人列表中"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "高级设置编辑器"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s 设置错误"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 msgid "Configure logging system"
 msgstr ""
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "显示所有未处理事件(_E)"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "为下一条未处理事件弹出窗口"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "数据库错误"
 
@@ -3193,44 +3203,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "与 %s 的聊天历史"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "对话历史"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "磁盘错误"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的状态是 %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "错误: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "错误"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "现在状态: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "现在状态:  %(status)s "
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主题: %s\n"
@@ -3240,25 +3250,25 @@ msgstr "主题: %s\n"
 msgid "_Change Status Message…"
 msgstr "更改状态消息(_C)"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "使用账户 %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "书签管理"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
 msgstr "隐藏联系人列表(_R)"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "显示联系人列表(_R)"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "隐藏本菜单"
 
@@ -3389,7 +3399,6 @@ msgid "Re_gister"
 msgstr "注册(_G)"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "加入(_J)"
@@ -3535,16 +3544,16 @@ msgstr "您将要关闭多个标签"
 msgid "Do you really want to close them all?"
 msgstr "您确定要关闭所有这些吗"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "多人聊天"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "私聊"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "消息"
 
@@ -3639,7 +3648,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "错误 %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "发送 %(message)s 时出现错误( %(error)s )"
@@ -3943,37 +3952,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "默认"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG密钥过期"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "错误字段"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "请重新输入您的 GPG 字段或点\"取消\""
@@ -4531,46 +4540,38 @@ msgid "show help on command"
 msgstr "为命令显示帮助"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "显示/隐藏联系人列表窗口"
-
-#: gajim/gajim_remote.py:93
-msgid "Pops up a window with the next pending event"
-msgstr "为下一条未处理事件弹出窗口"
-
-#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr "打印联系人列表中所有联系人。每个联系人一行。"
 
-#: 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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "账户"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "只显示指定帐户的联系人"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "打印注册的账户"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "改变一个或多个账户状态"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "状态"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4578,37 +4579,37 @@ msgstr ""
 "下列之一: offline, online, chat, away, xa, dnd, invisible。如果没有设置, 使用"
 "账户先前的状态"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "message"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "状态消息"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 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:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "改变一个或多个账户的优先级"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "优先级"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "您想要给予这个账户的优先级"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4616,7 +4617,7 @@ msgstr ""
 "改变指定账户的优先级。如果不指明, 将改变所有设置了\"与全局状态同步\"选项的账"
 "户"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4625,29 +4626,29 @@ msgstr ""
 "发送新聊天消息至联系人列表中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择"
 "\"帐户\"而不需要\" OpenPGP 密钥\", 只需将\" OpenPGP 密钥\"置为空。"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "消息内容"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定, 该消息将使用本公共密钥加密"
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定, 消息将被用此账户发送"
 
-#: gajim/gajim_remote.py:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4656,151 +4657,147 @@ msgstr ""
 "发送新聊天消息至联系人列表中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择"
 "\"帐户\"而不需要\" OpenPGP 密钥\", 只需将\" OpenPGP 密钥\"置为空。"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "主题"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "消息主题"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr "向一个您加入的聊天室发送新消息。"
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "要收到这条消息的聊天室的 JID"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "获得联系人的详细信息"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "联系人的 JID "
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "获得账户的详细信息"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "账户名称"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "向联系人发送文件"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "文件"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "文件路径"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "如指定, 文件将被用此账户发送"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "列出所有的参数及它们的值"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "将\"密钥\"的值设为\"值\""
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "键=值"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "\"密钥\"是参数名, 而\"值\"是赋予参数的数值"
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "删除一个参数项"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "é”®"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "需要删除的参数名"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "将当前Gajim的国家设置写入 .config 文件"
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "从联系人列表移除联系人"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定, 将从此帐户列表下移出联系人"
 
-#: gajim/gajim_remote.py:219
+#: gajim/gajim_remote.py:211
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "返回当前状态(如不指定账户将返回全局设置)"
 
-#: gajim/gajim_remote.py:226
+#: gajim/gajim_remote.py:218
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "返回当前状态信息(如不指定账户将返回全局设置)"
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "返回未读消息数"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "发送自定义 XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "发送 XML"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, 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:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr "改变头像"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr "要使用的图片"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 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:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "请检查 Gajim 是否正在运行"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "显示/隐藏 ipython 窗口"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的\"联系人 JID\"参数"
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4809,15 +4806,15 @@ msgstr ""
 "\"%s\" 不在您的联系人列表中。\n"
 "请为发送此消息指定账户。"
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "没有活动的账户"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "似乎 Gajim 不在运行。因此您无法使用 gajim-remote。"
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4826,16 +4823,16 @@ msgstr ""
 "用法: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "参数: "
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr " %s 未找到"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4846,7 +4843,7 @@ msgstr ""
 "用法: %s 命令 [参数] \n"
 "命令是下列之一: \n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4855,7 +4852,7 @@ msgstr ""
 "参数太多。\n"
 "输入 \"%(basename)s help %(command)s\" 获取更多信息"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5029,7 +5026,7 @@ msgstr "一周末"
 msgid "Weekend!"
 msgstr "周末"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5038,61 +5035,61 @@ msgstr ""
 "JID %s 不符合 RFC 标准。它没有被加入联系人列表。请使用诸如 http://jru."
 "jabberstudio.org/ 的联系人列表管理工具移除它"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "来自 %s 的解除认证请求"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "聊天室已经被销毁了"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "作为替代, 您可以加入这个聊天室: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "未知的 SSL 错误: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr " %(nickname)s 发来的新消息"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "来自聊天室 %s 的私人消息"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s:  %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "来自 %(nickname)s 的消息"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "来自 %(nickname)s 的新消息"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s 改变了状态"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s 上线了"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s 离开了"
@@ -6129,11 +6126,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "收到任意多人聊天消息播放的声音。"
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "绿色"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "杂货店"
 
@@ -6275,11 +6272,11 @@ msgstr "%s 是一个目录但它应该是一个文件"
 msgid "Error: cannot open %s for reading"
 msgstr "错误: 无法按读打开文件 %s"
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "青色"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "迁移记录数据库到索引"
 
@@ -7902,7 +7899,7 @@ msgid "Status:"
 msgstr "状态: "
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "记录聊天历史(_L)"
 
@@ -10133,6 +10130,11 @@ msgstr "已发送联系人: "
 msgid "Passphrase"
 msgstr "密文"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "输入 JID 或者联系人名"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "查找: "
@@ -10145,7 +10147,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "记录联系人状态变化(_L)"
@@ -10733,6 +10735,12 @@ msgstr "最近: "
 msgid "Plugin manager"
 msgstr "注册失败"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "显示/隐藏联系人列表窗口"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "显示/隐藏 ipython 窗口"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP 帐户 %s@%s"
@@ -11777,9 +11785,6 @@ msgstr "注册失败"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "输入 JID 或者联系人名"
-
 #~ msgid "Groupchat Histories"
 #~ msgstr "多人聊天历史"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e768f55792..05baf4b2bd 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: 2018-02-08 03:05+0000\n"
+"POT-Creation-Date: 2018-02-17 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"
@@ -476,67 +476,67 @@ msgstr "圖片不能被另存為 %(type)s 格式。另存為 %(new_filename)s?"
 msgid "Save Image as…"
 msgstr "圖片另存為…"
 
-#: gajim/vcard.py:166 gajim/vcard.py:510 gajim/profile_window.py:175
+#: gajim/vcard.py:166 gajim/vcard.py:513 gajim/profile_window.py:175
 #: gajim/chat_control.py:578
 #, fuzzy
 msgid "Save _As"
 msgstr "儲存在: %s"
 
-#: gajim/vcard.py:286 gajim/vcard.py:293
+#: gajim/vcard.py:289 gajim/vcard.py:296
 msgid "?Client:Unknown"
 msgstr "不明"
 
-#: gajim/vcard.py:290 gajim/vcard.py:295
+#: gajim/vcard.py:293 gajim/vcard.py:298
 msgid "?OS:Unknown"
 msgstr "不明"
 
-#: gajim/vcard.py:324 gajim/vcard.py:327
+#: gajim/vcard.py:327 gajim/vcard.py:330
 msgid "?Time:Unknown"
 msgstr "不明"
 
-#: gajim/vcard.py:378
+#: gajim/vcard.py:381
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Role in Group Chat:<b>角色</b>"
 
-#: gajim/vcard.py:382
+#: gajim/vcard.py:385
 msgid "<b>Affiliation:</b>"
 msgstr "<b>歸屬:</b>"
 
-#: gajim/vcard.py:389
+#: gajim/vcard.py:392
 #, fuzzy
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in their presence"
 msgstr "此聯絡人對您的狀態資訊感興趣，但您不關心他/她的狀態"
 
-#: gajim/vcard.py:391
+#: gajim/vcard.py:394
 #, fuzzy
 msgid ""
 "You are interested in the contact's presence information, but it is not "
 "mutual"
 msgstr "您對此聯絡人的狀態資訊感興趣，但他/她不關心您的狀態"
 
-#: gajim/vcard.py:393
+#: gajim/vcard.py:396
 #, fuzzy
 msgid "The contact and you want to exchange presence information"
 msgstr "您與此聯絡人同時對對方的狀態資訊感興趣"
 
-#: gajim/vcard.py:395
+#: gajim/vcard.py:398
 #, fuzzy
 msgid ""
 "You and the contact have a mutual disinterest in each-others presence "
 "information"
 msgstr "您與此聯絡人同時對對方的狀態資訊感興趣"
 
-#: gajim/vcard.py:401
+#: gajim/vcard.py:404
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待聯絡人回應您的認證請求"
 
-#: gajim/vcard.py:403
+#: gajim/vcard.py:406
 msgid "There is no pending subscription request."
 msgstr "沒有未處理的認證請求"
 
-#: gajim/vcard.py:408 gajim/vcard.py:452 gajim/vcard.py:565
+#: gajim/vcard.py:411 gajim/vcard.py:455 gajim/vcard.py:568
 msgid " resource with priority "
 msgstr "帶有優先等級的資源"
 
@@ -870,7 +870,7 @@ msgid "JID"
 msgstr "JID"
 
 #: gajim/history_manager.py:157 gajim/history_manager.py:201
-#: gajim/history_window.py:104
+#: gajim/history_window.py:108
 msgid "Date"
 msgstr "日期"
 
@@ -880,7 +880,7 @@ msgid "Nickname"
 msgstr "暱稱"
 
 #: gajim/history_manager.py:173 gajim/history_manager.py:208
-#: gajim/history_window.py:112 gajim/data/gui/xml_console_window.ui:108
+#: gajim/history_window.py:116 gajim/data/gui/xml_console_window.ui:108
 msgid "Message"
 msgstr "訊息"
 
@@ -1180,6 +1180,11 @@ msgstr ""
 msgid "we would like to thank all the package maintainers."
 msgstr "最後但不是最不重要的，我們要感謝所有的套件維護者。"
 
+#: gajim/dialogs.py:1319
+#, fuzzy
+msgid "Thanks"
+msgstr "æ„Ÿæ¿€"
+
 #: gajim/dialogs.py:1321
 msgid "translator-credits"
 msgstr ""
@@ -1318,7 +1323,7 @@ msgid "Without a connection, you can not synchronise your contacts."
 msgstr "未連線時，您不能同步您的聯絡人。"
 
 #: 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/history_window.py:100 gajim/disco.py:865 gajim/disco.py:1692
 #: gajim/disco.py:1977
 msgid "Name"
 msgstr "名稱"
@@ -1375,27 +1380,27 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "在兩個輸入框中輸入的密碼必須一致。"
 
 #: gajim/dialogs.py:3139 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2789
+#: gajim/common/connection_handlers_events.py:2745
 msgid "Contact Signed In"
 msgstr "聯絡人登入"
 
 #: gajim/dialogs.py:3141 gajim/notify.py:91
-#: gajim/common/connection_handlers_events.py:2795
+#: gajim/common/connection_handlers_events.py:2751
 msgid "Contact Signed Out"
 msgstr "聯絡人離開登入"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2609
+#: gajim/common/connection_handlers_events.py:2565
 msgid "New Message"
 msgstr "新訊息"
 
 #: gajim/dialogs.py:3143 gajim/notify.py:92 gajim/notify.py:105
-#: gajim/common/connection_handlers_events.py:2591
+#: gajim/common/connection_handlers_events.py:2547
 msgid "New Single Message"
 msgstr "新單條訊息"
 
 #: gajim/dialogs.py:3144 gajim/notify.py:92 gajim/notify.py:106
-#: gajim/common/connection_handlers_events.py:2597
+#: gajim/common/connection_handlers_events.py:2553
 msgid "New Private Message"
 msgstr "新個人訊息"
 
@@ -1428,7 +1433,7 @@ msgid "Groupchat Invitation"
 msgstr "多人聊天邀請"
 
 #: gajim/dialogs.py:3155 gajim/notify.py:93
-#: gajim/common/connection_handlers_events.py:2783
+#: gajim/common/connection_handlers_events.py:2739
 msgid "Contact Changed Status"
 msgstr "聯絡人狀態變更"
 
@@ -1802,7 +1807,7 @@ msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s 現在成了 %(new_nick)s"
 
 #: gajim/groupchat_control.py:218 gajim/groupchat_control.py:1941
-#: gajim/history_window.py:480 gajim/common/connection_handlers_events.py:2779
+#: gajim/history_window.py:550 gajim/common/connection_handlers_events.py:2735
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s 的狀態是 %(status)s"
@@ -2178,6 +2183,7 @@ msgid "_Accept"
 msgstr "帳號(_A)"
 
 #: gajim/chat_control.py:1633 gajim/disco.py:1752
+#: gajim/data/gui/join_groupchat_window.ui:325
 msgid "_Join"
 msgstr "加入(_J)"
 
@@ -2197,7 +2203,7 @@ msgstr "已合併的帳號"
 
 #: 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/roster_window.py:5128 gajim/message_window.py:525
 #: gajim/common/contacts.py:133 gajim/common/commands.py:230
 #: gajim/common/helpers.py:95
 msgid "Groupchats"
@@ -2583,49 +2589,53 @@ msgstr "命令歷程記錄管理器"
 msgid "_Join New Group Chat"
 msgstr "加入新的聊天室(_J)"
 
-#: gajim/gajim.py:72
+#: gajim/gajim.py:75
 #, fuzzy
 msgid "Show the application's version"
 msgstr "在通知區域顯示圖示:"
 
-#: gajim/gajim.py:75
+#: gajim/gajim.py:78
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "只顯示在聯絡人清單中"
 
-#: gajim/gajim.py:78
+#: gajim/gajim.py:81
 msgid "Separate profile files completely (even history db and plugins)"
 msgstr ""
 
-#: gajim/gajim.py:82
+#: gajim/gajim.py:85
 msgid "Print XML stanzas and other debug information"
 msgstr ""
 
-#: gajim/gajim.py:86
+#: gajim/gajim.py:89
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "進階設定編輯器"
 
-#: gajim/gajim.py:90
+#: gajim/gajim.py:93
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s 設定錯誤"
 
-#: gajim/gajim.py:93
+#: gajim/gajim.py:96
 #, fuzzy
 msgid "Configure logging system"
 msgstr "組配 %s"
 
-#: gajim/gajim.py:96
+#: gajim/gajim.py:99
 #, fuzzy
 msgid "Show all warnings"
 msgstr "顯示所有未處理事件(_E)"
 
-#: gajim/gajim.py:99
-msgid "open ipython shell"
+#: gajim/gajim.py:102
+msgid "Open IPython shell"
 msgstr ""
 
-#: gajim/gajim.py:159 gajim/gui_interface.py:127
+#: gajim/gajim.py:105
+msgid "Pops up a window with the next pending event"
+msgstr "為下一筆未處理事件彈出視窗"
+
+#: gajim/gajim.py:165 gajim/gui_interface.py:127
 msgid "Database Error"
 msgstr "資料庫錯誤"
 
@@ -3211,44 +3221,44 @@ msgstr ""
 msgid "Disconnect from the network"
 msgstr ""
 
-#: gajim/history_window.py:327
+#: gajim/history_window.py:339
 #, python-format
 msgid "Conversation History with %s"
 msgstr "與 %s 的聊天命令歷程"
 
-#: gajim/history_window.py:345 gajim/data/gui/history_window.ui:7
+#: gajim/history_window.py:361 gajim/data/gui/history_window.ui:7
 msgid "Conversation History"
 msgstr "對話命令歷程"
 
-#: gajim/history_window.py:374
+#: gajim/history_window.py:390 gajim/history_window.py:443
 msgid "Disk Error"
 msgstr "磁碟錯誤"
 
-#: gajim/history_window.py:476
+#: gajim/history_window.py:546
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的狀態是 %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:487
+#: gajim/history_window.py:557
 #, python-format
 msgid "Error: %s"
 msgstr "錯誤: %s"
 
-#: gajim/history_window.py:489
+#: gajim/history_window.py:559
 msgid "Error"
 msgstr "錯誤"
 
-#: gajim/history_window.py:491
+#: gajim/history_window.py:561
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "現在狀態: %(status)s: %(status_msg)s"
 
-#: gajim/history_window.py:494
+#: gajim/history_window.py:564
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "現在狀態:  %(status)s "
 
-#: gajim/history_window.py:515 gajim/conversation_textview.py:1338
+#: gajim/history_window.py:585 gajim/conversation_textview.py:1338
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主題: %s\n"
@@ -3258,25 +3268,25 @@ msgstr "主題: %s\n"
 msgid "_Change Status Message…"
 msgstr "變更狀態訊息(_C)"
 
-#: gajim/statusicon.py:250 gajim/statusicon.py:298 gajim/statusicon.py:305
+#: gajim/statusicon.py:252 gajim/statusicon.py:302 gajim/statusicon.py:309
 #, python-format
 msgid "using account %s"
 msgstr "使用帳號 %s"
 
-#: gajim/statusicon.py:315
+#: gajim/statusicon.py:319
 #, fuzzy
 msgid "_Manage Bookmarks…"
 msgstr "書籤管理"
 
-#: gajim/statusicon.py:328
+#: gajim/statusicon.py:332
 msgid "Hide _Roster"
 msgstr "隱藏聯絡人清單(_R)"
 
-#: gajim/statusicon.py:332
+#: gajim/statusicon.py:336
 msgid "Show _Roster"
 msgstr "顯示聯絡人清單(_R)"
 
-#: gajim/statusicon.py:340
+#: gajim/statusicon.py:344
 msgid "Hide this menu"
 msgstr "隱藏本選單"
 
@@ -3407,7 +3417,6 @@ msgid "Re_gister"
 msgstr "註冊(_G)"
 
 #: gajim/disco.py:1317 gajim/data/gui/join_groupchat_window.ui:186
-#: gajim/data/gui/join_groupchat_window.ui:325
 #, fuzzy
 msgid "Join"
 msgstr "加入(_J)"
@@ -3553,16 +3562,16 @@ msgstr "您將要關閉多個標籤"
 msgid "Do you really want to close them all?"
 msgstr "您確定要關閉所有這些嗎"
 
-#: gajim/message_window.py:541
+#: gajim/message_window.py:523
 #, fuzzy
 msgid "?Noun:Chats"
 msgstr "多人聊天"
 
-#: gajim/message_window.py:545
+#: gajim/message_window.py:527
 msgid "Private Chats"
 msgstr "私人聊天"
 
-#: gajim/message_window.py:551
+#: gajim/message_window.py:533
 msgid "Messages"
 msgstr "訊息"
 
@@ -3657,7 +3666,7 @@ msgid "Error %(code)s: %(msg)s"
 msgstr "錯誤 %(code)s: %(msg)s"
 
 #: gajim/gui_interface.py:470 gajim/gui_interface.py:486
-#: gajim/common/connection_handlers_events.py:1420
+#: gajim/common/connection_handlers_events.py:1376
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "傳送 %(message)s 時出現錯誤( %(error)s )"
@@ -3960,37 +3969,37 @@ msgstr ""
 msgid "Could not save your settings and preferences"
 msgstr "無法儲存您的設定。"
 
-#: 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
+#: gajim/gui_interface.py:2797 gajim/common/config.py:117
+#: gajim/common/config.py:531 gajim/common/optparser.py:335
+#: gajim/common/optparser.py:503 gajim/common/optparser.py:526
 msgid "default"
 msgstr "預設"
 
-#: gajim/gui_interface.py:2981
+#: gajim/gui_interface.py:2982
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: gajim/gui_interface.py:2982
+#: gajim/gui_interface.py:2983
 #, 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:2996
+#: gajim/gui_interface.py:2997
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG 密鑰過期"
 
-#: gajim/gui_interface.py:2997
+#: gajim/gui_interface.py:2998
 #, 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:3006
+#: gajim/gui_interface.py:3007
 msgid "Wrong Passphrase"
 msgstr "錯誤欄位"
 
-#: gajim/gui_interface.py:3007
+#: gajim/gui_interface.py:3008
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "請重新輸入您的 GPG 欄位或點\"取消\""
@@ -4547,46 +4556,38 @@ msgid "show help on command"
 msgstr "為命令顯示求助"
 
 #: gajim/gajim_remote.py:89
-msgid "Shows or hides the roster window"
-msgstr "顯示/隱藏聯絡人清單視窗"
-
-#: gajim/gajim_remote.py:93
-msgid "Pops up a window with the next pending event"
-msgstr "為下一筆未處理事件彈出視窗"
-
-#: gajim/gajim_remote.py:97
 #, fuzzy
 msgid "Lists all contacts in roster, one for each line"
 msgstr "列印聯絡人清單中所有聯絡人。每個聯絡人一列。"
 
-#: 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
+#: gajim/gajim_remote.py:91 gajim/gajim_remote.py:106 gajim/gajim_remote.py:116
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153 gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:204 gajim/gajim_remote.py:213
+#: gajim/gajim_remote.py:220
 #, fuzzy
 msgid "?CLI:account"
 msgstr "帳號"
 
-#: gajim/gajim_remote.py:99
+#: gajim/gajim_remote.py:91
 msgid "show only contacts of the given account"
 msgstr "只顯示指定帳號的聯絡人"
 
-#: gajim/gajim_remote.py:105
+#: gajim/gajim_remote.py:97
 msgid "Prints a list of registered accounts"
 msgstr "列印註冊的帳號"
 
-#: gajim/gajim_remote.py:109
+#: gajim/gajim_remote.py:101
 #, fuzzy
 msgid "Changes the status of account(s)"
 msgstr "變更一個或多個帳號狀態"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 #, fuzzy
 msgid "?CLI:status"
 msgstr "狀態"
 
-#: gajim/gajim_remote.py:112
+#: gajim/gajim_remote.py:104
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -4594,37 +4595,37 @@ msgstr ""
 "下列之一: offline，online，chat，away，xa，dnd，invisible。如果沒有設定，使用"
 "帳號先前的狀態"
 
-#: gajim/gajim_remote.py:113 gajim/gajim_remote.py:135
-#: gajim/gajim_remote.py:149 gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:105 gajim/gajim_remote.py:127
+#: gajim/gajim_remote.py:141 gajim/gajim_remote.py:152
 #, fuzzy
 msgid "?CLI:message"
 msgstr "message"
 
-#: gajim/gajim_remote.py:113
+#: gajim/gajim_remote.py:105
 msgid "status message"
 msgstr "狀態訊息"
 
-#: gajim/gajim_remote.py:114
+#: gajim/gajim_remote.py:106
 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:120
+#: gajim/gajim_remote.py:112
 #, fuzzy
 msgid "Changes the priority of account(s)"
 msgstr "變更一個或多個帳號的優先等級"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 #, fuzzy
 msgid "?CLI:priority"
 msgstr "優先等級"
 
-#: gajim/gajim_remote.py:122
+#: gajim/gajim_remote.py:114
 msgid "priority you want to give to the account"
 msgstr "您想要給予這個帳號的優先等級"
 
-#: gajim/gajim_remote.py:124
+#: gajim/gajim_remote.py:116
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -4632,7 +4633,7 @@ msgstr ""
 "變更指定帳號的優先等級。如果不指明，將變更所有設定了\"與全域狀態同步\"選項的"
 "帳號"
 
-#: gajim/gajim_remote.py:130
+#: gajim/gajim_remote.py:122
 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 "
@@ -4641,29 +4642,29 @@ msgstr ""
 "傳送新聊天訊息至聯絡人清單中的聯絡人。 OpenPGP 密鑰與帳號均可選。如果只選擇"
 "\"帳號\"而不需要\" OpenPGP 密鑰\"，只需將\" OpenPGP 密鑰\"置為空。"
 
-#: gajim/gajim_remote.py:134 gajim/gajim_remote.py:147
+#: gajim/gajim_remote.py:126 gajim/gajim_remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "聯絡人的JID將收到訊息"
 
-#: gajim/gajim_remote.py:135 gajim/gajim_remote.py:149
-#: gajim/gajim_remote.py:160
+#: gajim/gajim_remote.py:127 gajim/gajim_remote.py:141
+#: gajim/gajim_remote.py:152
 msgid "message contents"
 msgstr "訊息內容"
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "PGP key"
 msgstr ""
 
-#: gajim/gajim_remote.py:136 gajim/gajim_remote.py:150
+#: gajim/gajim_remote.py:128 gajim/gajim_remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定，該訊息將使用本公共密鑰加密"
 
-#: gajim/gajim_remote.py:138 gajim/gajim_remote.py:152
-#: gajim/gajim_remote.py:161
+#: gajim/gajim_remote.py:130 gajim/gajim_remote.py:144
+#: gajim/gajim_remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定，訊息將被用此帳號傳送"
 
-#: gajim/gajim_remote.py:143
+#: gajim/gajim_remote.py:135
 #, fuzzy
 msgid ""
 "Sends a chat message to someone on your roster. Optionally with OpenPGP key "
@@ -4672,151 +4673,147 @@ msgstr ""
 "傳送新聊天訊息至聯絡人清單中的聯絡人。 OpenPGP 密鑰與帳號均可選。如果只選擇"
 "\"帳號\"而不需要\" OpenPGP 密鑰\"，只需將\" OpenPGP 密鑰\"置為空。"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "subject"
 msgstr "主題"
 
-#: gajim/gajim_remote.py:148
+#: gajim/gajim_remote.py:140
 msgid "message subject"
 msgstr "訊息主題"
 
-#: gajim/gajim_remote.py:157
+#: gajim/gajim_remote.py:149
 msgid "Sends new message to a groupchat you've joined."
 msgstr "向一個您加入的聊天室傳送新訊息。"
 
-#: gajim/gajim_remote.py:159
+#: gajim/gajim_remote.py:151
 msgid "JID of the room that will receive the message"
 msgstr "要收到這條訊息的聊天室的 JID"
 
-#: gajim/gajim_remote.py:166
+#: gajim/gajim_remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "獲得聯絡人的詳細資訊"
 
-#: gajim/gajim_remote.py:168 gajim/gajim_remote.py:181
-#: gajim/gajim_remote.py:211
+#: gajim/gajim_remote.py:160 gajim/gajim_remote.py:173
+#: gajim/gajim_remote.py:203
 msgid "JID of the contact"
 msgstr "聯絡人的 JID "
 
-#: gajim/gajim_remote.py:172
+#: gajim/gajim_remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "獲得帳號的詳細資訊"
 
-#: gajim/gajim_remote.py:174
+#: gajim/gajim_remote.py:166
 msgid "Name of the account"
 msgstr "帳號名稱"
 
-#: gajim/gajim_remote.py:178
+#: gajim/gajim_remote.py:170
 msgid "Sends file to a contact"
 msgstr "向聯絡人傳送檔案"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "file"
 msgstr "檔案"
 
-#: gajim/gajim_remote.py:180
+#: gajim/gajim_remote.py:172
 msgid "File path"
 msgstr "檔案路徑"
 
-#: gajim/gajim_remote.py:182
+#: gajim/gajim_remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "如指定，檔案將被用此帳號傳送"
 
-#: gajim/gajim_remote.py:187
+#: gajim/gajim_remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "列出所有的參數及它們的值"
 
-#: gajim/gajim_remote.py:191
+#: gajim/gajim_remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "將\"密鑰\"的值設為\"值\""
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 msgid "key=value"
 msgstr "鍵=值"
 
-#: gajim/gajim_remote.py:193
+#: gajim/gajim_remote.py:185
 #, fuzzy
 msgid "'key' is the name of the preference, 'value' is what to set it to"
 msgstr "\"密鑰\"是參數名稱，而\"值\"是賦予參數的數值"
 
-#: gajim/gajim_remote.py:198
+#: gajim/gajim_remote.py:190
 msgid "Deletes a preference item"
 msgstr "刪除一個參數項"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "key"
 msgstr "鍵"
 
-#: gajim/gajim_remote.py:200
+#: gajim/gajim_remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "需要刪除的參數名稱"
 
-#: gajim/gajim_remote.py:204
+#: gajim/gajim_remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "將目前Gajim的國家設定寫入 .config 檔案"
 
-#: gajim/gajim_remote.py:209
+#: gajim/gajim_remote.py:201
 msgid "Removes contact from roster"
 msgstr "從聯絡人清單移除聯絡人"
 
-#: gajim/gajim_remote.py:212
+#: gajim/gajim_remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定，將從此帳號清單下移出聯絡人"
 
-#: gajim/gajim_remote.py:219
+#: gajim/gajim_remote.py:211
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "回傳目前狀態(如不指定帳號將回傳全域設定)"
 
-#: gajim/gajim_remote.py:226
+#: gajim/gajim_remote.py:218
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "回傳目前狀態資訊(如不指定帳號將回傳全域設定)"
 
-#: gajim/gajim_remote.py:233
+#: gajim/gajim_remote.py:225
 msgid "Returns number of unread messages"
 msgstr "回傳未讀訊息數"
 
-#: gajim/gajim_remote.py:238
+#: gajim/gajim_remote.py:230
 msgid "Sends custom XML"
 msgstr "傳送自訂 XML"
 
-#: gajim/gajim_remote.py:240
+#: gajim/gajim_remote.py:232
 msgid "XML to send"
 msgstr "傳送 XML"
 
-#: gajim/gajim_remote.py:241
+#: gajim/gajim_remote.py:233
 #, 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:247
+#: gajim/gajim_remote.py:239
 msgid "Change the avatar"
 msgstr "變更頭像"
 
-#: gajim/gajim_remote.py:249
+#: gajim/gajim_remote.py:241
 msgid "Picture to use"
 msgstr "要使用的圖片"
 
-#: gajim/gajim_remote.py:250
+#: gajim/gajim_remote.py:242
 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:257
+#: gajim/gajim_remote.py:249
 msgid "Check if Gajim is running"
 msgstr "請檢查 Gajim 是否正在執行"
 
-#: gajim/gajim_remote.py:261
-msgid "Shows or hides the ipython window"
-msgstr "顯示/隱藏 ipython 視窗"
-
-#: gajim/gajim_remote.py:287
+#: gajim/gajim_remote.py:275
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的\"聯絡人 JID\"參數"
 
-#: gajim/gajim_remote.py:307
+#: gajim/gajim_remote.py:295
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4825,15 +4822,15 @@ msgstr ""
 "\"%s\" 不在您的聯絡人清單中。\n"
 "請為傳送此訊息指定帳號。"
 
-#: gajim/gajim_remote.py:310
+#: gajim/gajim_remote.py:298
 msgid "You have no active account"
 msgstr "沒有活動的帳號"
 
-#: gajim/gajim_remote.py:358
+#: gajim/gajim_remote.py:346
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "似乎 Gajim 不在執行。因此您無法使用 gajim-remote。"
 
-#: gajim/gajim_remote.py:385
+#: gajim/gajim_remote.py:373
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -4842,16 +4839,16 @@ msgstr ""
 "用法: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: gajim/gajim_remote.py:389
+#: gajim/gajim_remote.py:377
 msgid "Arguments:"
 msgstr "參數:"
 
-#: gajim/gajim_remote.py:393
+#: gajim/gajim_remote.py:381
 #, python-format
 msgid "%s not found"
 msgstr " %s 找不到"
 
-#: gajim/gajim_remote.py:399
+#: gajim/gajim_remote.py:387
 #, fuzzy, python-format
 msgid ""
 "Usage:\n"
@@ -4862,7 +4859,7 @@ msgstr ""
 "用法: %s 命令 [參數] \n"
 "命令是下列之一: \n"
 
-#: gajim/gajim_remote.py:469
+#: gajim/gajim_remote.py:457
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4871,7 +4868,7 @@ msgstr ""
 "參數太多。\n"
 "輸入 \"%(basename)s help %(command)s\" 獲取更多資訊"
 
-#: gajim/gajim_remote.py:474
+#: gajim/gajim_remote.py:462
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -5045,7 +5042,7 @@ msgstr "一週末"
 msgid "Weekend!"
 msgstr "週末"
 
-#: gajim/common/connection_handlers_events.py:352
+#: gajim/common/connection_handlers_events.py:350
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5054,61 +5051,61 @@ msgstr ""
 "JID %s 不符合 RFC 標準。它沒有被加入聯絡人清單。請使用諸如 http://jru."
 "jabberstudio.org/ 的聯絡人清單管理工具移除它"
 
-#: gajim/common/connection_handlers_events.py:877
+#: gajim/common/connection_handlers_events.py:833
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "來自 %s 的解除認證請求"
 
-#: gajim/common/connection_handlers_events.py:977
+#: gajim/common/connection_handlers_events.py:933
 msgid "Room has been destroyed"
 msgstr "聊天室已經被銷毀了"
 
-#: gajim/common/connection_handlers_events.py:985
+#: gajim/common/connection_handlers_events.py:941
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "做為替代，您可以加入這個聊天室: %s"
 
-#: gajim/common/connection_handlers_events.py:1947
+#: gajim/common/connection_handlers_events.py:1903
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "不明的 SSL 錯誤: %d"
 
-#: gajim/common/connection_handlers_events.py:2593
+#: gajim/common/connection_handlers_events.py:2549
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr " %(nickname)s 發來的新訊息"
 
-#: gajim/common/connection_handlers_events.py:2599
+#: gajim/common/connection_handlers_events.py:2555
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "來自聊天室 %s 的私人訊息"
 
-#: gajim/common/connection_handlers_events.py:2602
+#: gajim/common/connection_handlers_events.py:2558
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s:  %(message)s"
 
-#: gajim/common/connection_handlers_events.py:2605
+#: gajim/common/connection_handlers_events.py:2561
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "來自 %(nickname)s 的訊息"
 
-#: gajim/common/connection_handlers_events.py:2611
+#: gajim/common/connection_handlers_events.py:2567
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "來自 %(nickname)s 的新訊息"
 
-#: gajim/common/connection_handlers_events.py:2777
+#: gajim/common/connection_handlers_events.py:2733
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s 變更了狀態"
 
-#: gajim/common/connection_handlers_events.py:2785
+#: gajim/common/connection_handlers_events.py:2741
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s 上線了"
 
-#: gajim/common/connection_handlers_events.py:2791
+#: gajim/common/connection_handlers_events.py:2747
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s 離開了"
@@ -6142,11 +6139,11 @@ msgstr ""
 msgid "Sound to play when any MUC message arrives."
 msgstr "收到任意多人聊天訊息播放的聲音。"
 
-#: gajim/common/config.py:534 gajim/common/optparser.py:355
+#: gajim/common/config.py:534 gajim/common/optparser.py:349
 msgid "green"
 msgstr "綠色"
 
-#: gajim/common/config.py:538 gajim/common/optparser.py:341
+#: gajim/common/config.py:538 gajim/common/optparser.py:335
 msgid "grocery"
 msgstr "雜貨店"
 
@@ -6288,11 +6285,11 @@ msgstr "%s 是一個目錄但它應該是一個檔案"
 msgid "Error: cannot open %s for reading"
 msgstr "錯誤: 無法按讀開啟檔案 %s"
 
-#: gajim/common/optparser.py:350 gajim/common/optparser.py:351
+#: gajim/common/optparser.py:344 gajim/common/optparser.py:345
 msgid "cyan"
 msgstr "青色"
 
-#: gajim/common/optparser.py:419
+#: gajim/common/optparser.py:413
 msgid "migrating logs database to indices"
 msgstr "遷移記錄資料庫到索引"
 
@@ -7917,7 +7914,7 @@ msgid "Status:"
 msgstr "狀態:"
 
 #: gajim/data/gui/zeroconf_information_window.ui:89
-#: gajim/data/gui/history_window.ui:197
+#: gajim/data/gui/history_window.ui:290
 msgid "_Log conversation history"
 msgstr "記錄聊天命令歷程(_L)"
 
@@ -10140,6 +10137,11 @@ msgstr "已傳送聯絡人:"
 msgid "Passphrase"
 msgstr "密文"
 
+#: gajim/data/gui/history_window.ui:38
+#, fuzzy
+msgid "Enter name / JID of contact or groupchat"
+msgstr "輸入 JID 或是聯絡人名稱"
+
 #: gajim/data/gui/history_window.ui:51
 msgid "Search:"
 msgstr "搜尋:"
@@ -10152,7 +10154,7 @@ msgstr ""
 msgid "Only searching within selected day"
 msgstr ""
 
-#: gajim/data/gui/history_window.ui:213
+#: gajim/data/gui/history_window.ui:306
 #, fuzzy
 msgid "_Show status changes"
 msgstr "記錄聯絡人狀態變化(_L)"
@@ -10734,6 +10736,12 @@ msgstr "最近:"
 msgid "Plugin manager"
 msgstr "外掛程式失敗"
 
+#~ msgid "Shows or hides the roster window"
+#~ msgstr "顯示/隱藏聯絡人清單視窗"
+
+#~ msgid "Shows or hides the ipython window"
+#~ msgstr "顯示/隱藏 ipython 視窗"
+
 #, fuzzy
 #~ msgid "XMPP account %s"
 #~ msgstr "XMPP 帳號 %s@%s"
@@ -11776,9 +11784,6 @@ msgstr "外掛程式失敗"
 #~ msgid "*"
 #~ msgstr "*"
 
-#~ msgid "Enter JID or Contact name"
-#~ msgstr "輸入 JID 或是聯絡人名稱"
-
 #~ msgid "Groupchat Histories"
 #~ msgstr "多人聊天命令歷程"
 
-- 
GitLab