diff --git a/po/bg/LC_MESSAGES/gajim.po b/po/bg/LC_MESSAGES/gajim.po
index a0881db07..19aa31dde 100644
--- a/po/bg/LC_MESSAGES/gajim.po
+++ b/po/bg/LC_MESSAGES/gajim.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-08-26 21:22+0300\n"
 "Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "GTK Jabber клиент"
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -56,39 +56,40 @@ msgstr "Няма"
 msgid "Hidden"
 msgstr "Бащино:"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Разговор"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Стая"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "акаунт: "
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "не е в списъка"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Превключване на %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -104,164 +105,166 @@ msgstr ""
 "\n"
 "Осветяването на неправилно изписаните думи няма да се използва"
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Всеки %s _минути"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Събитие"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Звук"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "заглавие на съобщението за състояние"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "текст на съобщението за състояние"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP не може да бъде използван на този компютър"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "В момента сте свързани със сървъра"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Трябва да посочите някакво име на акаунта."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Името на акаунта не може да съдържа интервали."
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "Невалиден Jabber ID"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID трябва да бъде под формата на „user@server“"
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт"
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Няма такъв наличен акаунт"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни."
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Неуспех при извличането на частните ключове"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Парола"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Изберете вашия OpenPGP ключ"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Няма избран ключ"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Сървър"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Транспорти"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Изображение"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "Изображението е твърде голямо"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -269,65 +272,65 @@ msgstr ""
 "Изображението на емотиконата трябва да бъде по-малко или равно на 24 пиксела "
 "по ширина и височина."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт %s"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Нова стая"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 #, fuzzy
 msgid "Invalid username"
 msgstr "Невалидно потребителско име"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 #, fuzzy
 msgid "You must provide a username to configure this account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Невалидна парола"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Трябва да въведете парола за новия акаунт."
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 #, fuzzy
 msgid "Account has been added successfully"
 msgstr "Отметката беше добавена успешно"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
@@ -337,20 +340,20 @@ msgstr ""
 "Може да настроите допълнителните опции от менюто „Редактиране“->„Акаунти“ в "
 "основния прозорец."
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 #, fuzzy
 msgid "Your new account has been created successfully"
 msgstr "Отметката беше добавена успешно"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
 
@@ -394,13 +397,14 @@ msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -505,27 +509,26 @@ msgstr "Искане за записване от %s"
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Влизане в стая като %s"
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Ново съобщение като %s"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "за акаунт „%s“"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Ново съобщение"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "_Започване на разговор"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -534,130 +537,135 @@ msgstr ""
 "искате да изпратите съобщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Трябва да сте свързани, за да променяте паролата."
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Трябва да въведете парола."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Ново съобщение"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Ново еднократно съобщение"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 #, fuzzy
 msgid "New Private Message"
 msgstr "_Изпращане на частно съобщение"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, fuzzy, python-format
 msgid "From %s in room %s"
 msgstr "%s сега е %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "От %s"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "От %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Еднократно съобщение като %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML конзола за %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "XML конзола"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, fuzzy, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Поканени сте в стаята „%s“ от „%s“"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
@@ -721,7 +729,7 @@ msgstr ""
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "_Редактиране"
 
@@ -742,7 +750,7 @@ msgstr "Jabber ID:"
 msgid "Description"
 msgstr "Описание: %s"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Влизане"
 
@@ -794,7 +802,7 @@ msgstr "Запазен в: %s"
 msgid "File transfer completed"
 msgstr "Файловият трансфер завърши"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Отваряне на папката"
 
@@ -902,7 +910,7 @@ msgstr "Изпращач: "
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "П_родължаване"
 
@@ -1214,8 +1222,8 @@ msgstr "Приемате ли това запитване?"
 msgid "error while sending"
 msgstr "грешка при изпращане"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Общи"
 
@@ -1243,32 +1251,32 @@ msgstr "Винаги ще го виждате като изключен."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Не може да бъде установен контакт с „%s“"
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Проверете връзката или опитайте отново по-късно."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "Паролата е грешна"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "В момента сте свързани без OpenPGP ключ."
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 #, fuzzy
 msgid "Your personal information has been published successfully."
 msgstr "Отметката беше добавена успешно"
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1276,12 +1284,12 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 #, fuzzy
 msgid "Could not save your settings and preferences"
 msgstr "Настройките на могат да бъдат запазени"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
@@ -1595,7 +1603,7 @@ msgstr "Описание: %s"
 
 #: ../src/gtkgui.glade.h:11
 #, fuzzy
-msgid "<b>Format of a Chat Line</b>"
+msgid "<b>Format of a line</b>"
 msgstr "<b>Формат на реда в разговор</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1829,47 +1837,47 @@ msgid "Bold"
 msgstr "Получер"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "С_вързване при стартиране"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Отменя файловия трансфер"
 
-#: ../src/gtkgui.glade.h:74
-msgid "Cancels the selected file transfer"
-msgstr "Отменя избрания файлов трансфер"
-
 #: ../src/gtkgui.glade.h:75
-#, fuzzy
-msgid "Cancels the selected file transfer and removes incomplete file"
+msgid "Cancels the selected file transfer"
 msgstr "Отменя избрания файлов трансфер"
 
 #: ../src/gtkgui.glade.h:76
 #, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr "Отменя избрания файлов трансфер"
+
+#: ../src/gtkgui.glade.h:77
+#, fuzzy
 msgid "Chan_ge Password"
 msgstr "Промяна на парола"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Промяна на парола"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Смяна на псе_вдоним"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Промяна на _темата"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "У_ведомления при разговор:"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Разговор с"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Проверка за нова в_ерсия при стартиране"
@@ -2006,106 +2014,102 @@ msgid "Display status messages of contacts in roster"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "Е-поща"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "Е-поща:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Редактиране на групи"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "Редактиране на личните данни..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Редактиране на _групи"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Активиране"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Въведете я отново за потвърждение:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Въведете нова парола:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Събития"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Всеки 5 _минути"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Допълнителен адрес:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Фамилия:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Файлови трансфери"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Файлови трансфери"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Файлов мениджър:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Филтър:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 #, fuzzy
 msgid "Font style:"
 msgstr "Шрифт:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Шрифт:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Формат: гггг-мм-дд"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "От:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 #, fuzzy
 msgid "G_o"
 msgstr "Отиване"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Персонализиране на темите на Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2115,7 +2119,7 @@ msgstr ""
 "получава мета-информация, свързана с разговора с даден контакт, като "
 "например писане на съобщение."
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2123,13 +2127,13 @@ msgstr ""
 "Автоматично ще се показва новото съобщение в нов прозорец за разговор или "
 "страница в съществуващ прозорец"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
 msgstr "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2137,7 +2141,7 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "свързване на контакти"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2145,83 +2149,83 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "изключване на контакти"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Само ще се променя иконата на контакта, който е изпратил съобщението"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 #, fuzzy
 msgid "Gajim: Account Creation Wizard"
 msgstr "Помощник при първоначално стартиране на Gajim"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Собствено:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Група:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "Свързване по HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Скрива прозореца"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Страница в Интернет:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Хост: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "Вече имам регистриран акаунт"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Искам да _регистрирам нов Jabber акаунт"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще има и икона в областта за уведомяване."
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Ако тази опция е избрана, ще влизате в тази стая при стартиране."
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Ако тази опция е избрана, ще се запомни паролата за този акаунт."
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2229,7 +2233,7 @@ msgstr ""
 "Ако тази опция е избрана, ще се запомнят размерите и позициите на списъка и "
 "прозореца за разговор на екрана за следващото стартиране на програмата."
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2237,7 +2241,7 @@ msgstr ""
 "Ако тази опция е избрана, усмивките в ASCII като „:)“ ще се изобразяват със "
 "съответните графични емотикони."
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2245,7 +2249,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще изпраща пакети за поддържане на връзката "
 "с цел избягване на разпадането ѝ."
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 #, fuzzy
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -2254,7 +2258,7 @@ msgstr ""
 "Ако е избрано, паролата ще се запази в ~/.gajim/config с права за четене "
 "само за потребителя и администратора"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2264,7 +2268,7 @@ msgstr ""
 "състояние (т.е. контакт от MSN ще има еквивалентната за MSN икона за "
 "състоянията „На линия“, „Отсъствам“, „Зает“ и т.н.)."
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2272,14 +2276,14 @@ msgstr ""
 "Ако тази опция е избрана, при стартиране Gajim ще се свързва автоматично, "
 "използвайки този акаунт."
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2287,181 +2291,181 @@ msgstr ""
 "Ако имате два или повече акаунта и тази опция е избрана, Gajim ще изобразява "
 "всички контакти като от един акаунт."
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Входящо съобщение:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Информация/запитване"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 #, fuzzy
 msgid "Information about you, as stored in the server"
 msgstr "Личните данни се запазват на сървъра като vCard"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Курсив"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "Влизане в _стая"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Местонахождение"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Запазване на разговорите"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Управление на акаунти"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Управление на отметките"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Управление на емотикони"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Настройки на сървъра-посредник"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Управление на..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Бащино:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "_Председател"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Още"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Име:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Има нова версия на Gajim"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Псевдоним:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Няма"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Уведомяване за контакти при: "
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "На _всяко съобщение"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Отваряне на страницата за изтегляне"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Отваряне..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP криптиране"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "Или изберете настроено съобщение:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Изходящо съобщение:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "_Парола:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 #, fuzzy
 msgid "Personal Information"
 msgstr "Редактиране на личните данни..."
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Телефон:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "Изпълнение на _звуци"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Порт: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Длъжност:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "Пощенски код:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Настройки"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Обръщение:"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Изписване на времето:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "Приори_тет:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2471,18 +2475,22 @@ msgstr ""
 "събитията от Jabber сървър, когато два или повече клиента са свързани с един "
 "и същ акаунт. Клиентът с най-голям приоритет ще получава събитията."
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Профил и аватар"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Сървър-посредник:"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Скоро посетени:"
@@ -2583,106 +2591,106 @@ msgid "Send File"
 msgstr "Изпращане на файл"
 
 #: ../src/gtkgui.glade.h:246
-#, fuzzy
-msgid "Send New Message"
-msgstr "Ново съобщение"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Изпращане на _еднократно съобщение"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "Изпращане на _файл"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 #, fuzzy
 msgid "Send _New Message..."
 msgstr "_Ново съобщение..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Изпращане на пакети за поддържане на връзката"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Изпращане на съобщение"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Изпращане на съобщението и затваряне на прозореца"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr ""
 "Изпраща съобщение на всички потребители, свързани със сървъра в момента"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Сървър:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Функционалности на сървърите"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Настройване на MOTD"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Настройване на съобщение за деня"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Избор на _аватар"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Настройване на съобщение за деня"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "Показване на изкл_ючените контакти"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Show _Roster"
 msgstr "Показване само в спис_ъка"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "_XML конзола"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Показване само в спис_ъка"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Показва списък с файловите трансфери между двата контакта"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "_Свързване"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "Изкл_ючване"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Подреждане на контактите по състояние"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Състояние"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Започване на _разговор"
@@ -2691,7 +2699,7 @@ msgstr "Започване на _разговор"
 msgid "State:"
 msgstr "Щат:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Състояние"
 
@@ -2861,338 +2869,344 @@ msgstr ""
 msgid "Your JID:"
 msgstr "Вашия JID:"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Действия"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "_Добавяне на контакт..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "Добавяне към _списъка..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Администратор"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Администратор"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "На_преднали"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Упълномощаване"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid "_Background:"
 msgstr "Цвят на фона"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "_Забраняване на достъпа"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "_Добавяне на тази стая към отметките"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "Интернет _браузър:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_Отказ"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "_Компактен изглед (Alt+C)"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 #, fuzzy
 msgid "_Contents"
 msgstr "П_родължаване"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "Копиране на _JID/Е-поща"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Копиране на адреса на връзката"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "_Отказване"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_Filter:"
 msgstr "Филтър:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Приключване"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Group Chat"
 msgstr "Стая"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "_Осветяване на неправилно изписаните думи"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_История"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Хост:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Икона в областта за уведомяване"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 #, fuzzy
 msgid "_Join New Room..."
 msgstr "Нова стая"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "_Изритване"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "_Пощенска програма:"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Член"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "_Смесване на акаунти"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Съобщение"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "Пром_яна"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 #, fuzzy
 msgid "_Modify Account..."
 msgstr "_Редактиране на акаунт..."
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Име: "
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Никога"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "_Уведомяване"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомяване при завършване на файловия трансфер"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_Да"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "_Действия"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "_Свързани потребители"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Отваряне на пощенската програма"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "_Отваряне на връзката в браузър"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "Со_бственик"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "_Парола:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "П_ауза"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Плейър:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "_Показване"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "По_рт:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Настройки"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Състояние"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Публикуване"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Изход"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "_Премахване"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "_Премахване от списъка"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "_Преименуване"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "_Отговор"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Извличане"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "_Изпращане"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "Изпра_щане и затваряне"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "_Изпращане на частно съобщение"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "_Изпращане на съобщение от сървъра"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "_Изпращане на еднократно съобщение"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "С_ървър:"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "_Избор на изображение..."
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "_Започване на разговор"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Състояние"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Записване"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Записване"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Използване на сървър-посредник"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "И_ме на потребител:"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Глас"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "_XML конзола..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "списък с файлови трансфери"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "минути"
 
@@ -3217,27 +3231,41 @@ msgstr ""
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Щат:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Съобщение"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История на разговорите с %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%s вече е %s (%s)"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Сегашното състояние е: %s: %s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "Сегашното състояние е: %s: %s"
@@ -3307,7 +3335,7 @@ msgstr "_Смесване на акаунти"
 msgid "You are already in room %s"
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 #, fuzzy
 msgid "You cannot join a room while you are invisible"
 msgstr "Трябва да сте свързани, за да влезете в стая."
@@ -3331,27 +3359,27 @@ msgstr "към акаунт „%s“"
 msgid "using %s account"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "като %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s вече е %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -3359,72 +3387,72 @@ msgid ""
 msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти от „%s“"
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Изберете ключ за този контакт"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr ""
 "Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
 "roster."
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 #, fuzzy
 msgid "Re_name"
 msgstr "Преименуване"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "С_вързване"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "Изкл_ючване"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 #, fuzzy
 msgid "_Change Status Message"
 msgstr "Съобщение за състояние „%s“"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Упълномощаването беше изпратено"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Винаги ще го виждате като изключен."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -3433,60 +3461,60 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът „%s“ "
 "винаги ще ви вижда изключен."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Необходима е парола"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Въведете парола за GPG ключ за акаунт „%s“"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Запазване на паролата"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Jabber акаунт."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3494,7 +3522,7 @@ msgstr ""
 "Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
 "историята."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 #, fuzzy
 msgid "Change Status Message..."
 msgstr "Съобщение за състояние „%s“"
@@ -3506,16 +3534,17 @@ msgstr "Съобщение за състояние „%s“"
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "като "
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "акаунт: "
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 #, fuzzy
 msgid "Hide this menu"
 msgstr "Скрива прозореца"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr "Всички контакти в тази група са изключени или има грешки"
 
@@ -3556,29 +3585,29 @@ msgstr ""
 "историята, съобщението ще бъде загубено."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "В момента няма връзка"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на частно съобщение"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Вече не сте в стая „%s“ или „%s“ е напуснал(а)."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Криптирането е включено"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Криптирането е изключено"
 
@@ -3890,231 +3919,231 @@ msgid ""
 "his or her status and/or his status message."
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Спя"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Връщам се скоро"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Хапвам"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Хапвам, оставете съобщение."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Работя"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Работя."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Навън"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Наслаждавам се на живота навън"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 #, fuzzy
 msgid "marine"
 msgstr "минути"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr ""
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Неуспех при влизането в стаята"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr ""
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 #, fuzzy
 msgid "You are banned from this room."
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr ""
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr ""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr ""
 "Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
 "roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "вече сме записани за %s"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "искане за отписване от %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "вече сме отписани от %s"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Връзката на акаунт „%s“ се разпадна"
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "За да продължите да изпращате и получавате съобщения, трябва да се свържете "
 "наново."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не може да се осъществи свързване с „%s“"
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, fuzzy, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Свързан към сървър с %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Проверете връзката или опитайте отново по-късно"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Неуспех при удостоверяването с „%s“"
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Проверете дали името и паролата са правилни."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "Не беше зададена парола за OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "невидим"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "изключен"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "%s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Това съобщение е криптирано]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4123,17 +4152,17 @@ msgstr ""
 "Тема: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 #, fuzzy
 msgid "Timeout"
 msgstr "Тема"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr ""
 
@@ -4363,6 +4392,29 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "грешка: %s не може да бъде отворен за четене"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Ново съобщение като %s"
+
+#~ msgid "Chat with"
+#~ msgstr "Разговор с"
+
+#~ msgid "E-Mail"
+#~ msgstr "Е-поща"
+
+#, fuzzy
+#~ msgid "Send New Message"
+#~ msgstr "Ново съобщение"
+
+#~ msgid "as %s"
+#~ msgstr "като %s"
+
+#~ msgid "as "
+#~ msgstr "като "
+
 #, fuzzy
 #~ msgid "Send _New Message"
 #~ msgstr "_Ново съобщение"
diff --git a/po/cs/LC_MESSAGES/gajim.po b/po/cs/LC_MESSAGES/gajim.po
index d21d8092d..b77600784 100644
--- a/po/cs/LC_MESSAGES/gajim.po
+++ b/po/cs/LC_MESSAGES/gajim.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-09-01 22:36+0100\n"
 "Last-Translator: Petr Mensik <pihham@cipis.net>\n"
 "Language-Team:  <cs@li.org>\n"
@@ -40,7 +40,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "GTK jabber client"
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -73,39 +73,40 @@ msgstr "Žádný"
 msgid "Hidden"
 msgstr "Střední:"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Rozhovor"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Diskuze"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "účet: "
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "není v seznamu"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Přepnout na %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -121,163 +122,165 @@ msgstr ""
 "\n"
 "Vlastnost zvýrazňování překlepů nebude použita"
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Každých %s _minut"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Aktivní"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Událost"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "titulek stavu"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "text stavu"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP není použitelné na tomto počítači"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Neplatné jméno účtu"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Jméno účtu nemůže být prázdné."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musí být ve tvaru \"uživatel@jménoserveru\"."
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr "Musíte vytvořit účet před úpravou vašich osobních údajů."
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Selhalo získání privátního klíče"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Nastala chyba při získávání Vašich OpenPGP privátních klíčů."
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Heslo"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Není zvolen žádný klíč"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Jméno"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Server"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Text"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Obrázek"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "Obrázek je příliš velký"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -285,67 +288,67 @@ msgstr ""
 "Obrázek pro smajlík musí být menší nebo roven 24 pixelů na šířku a 24 pixelů "
 "na výšku."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Nová místnost"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Prosím nezapomeňte vyplnit políčka server a místnost, nebo smažte tuto "
 "záložku."
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 #, fuzzy
 msgid "Invalid username"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 #, fuzzy
 msgid "You must provide a username to configure this account."
 msgstr "Musíte zadat uživatelské jméno při přidání účtu."
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Musíte zadat heslo pro nový účet."
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 #, fuzzy
 msgid "Account has been added successfully"
 msgstr "Záložka byla úspěšně přidána"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
@@ -355,20 +358,20 @@ msgstr ""
 "Můžete nastavit pokročilá nastaveníá použitím \"Úpravy->Účty\" z hlavního "
 "okna."
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 #, fuzzy
 msgid "Your new account has been created successfully"
 msgstr "Záložka byla úspěšně přidána"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
@@ -412,13 +415,14 @@ msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
@@ -517,157 +521,161 @@ msgstr "Žádost o autorizaci od %s"
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nemůžete vstoupit do diskuze pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Připojit se do diskuze jako %s"
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Nová zpráva jako %s"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "pro účet %s"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Nová zpráva"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "_Začít rozhovor"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr "Vyplňte ID kontaktu se kterým chcete začít rozhovor:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím ujistěte se že jste připojen s účtem \"%s\"."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hesla zadaná v obou políčkách musí být identická."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Nová zpráva"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Nová jednoduché zpráva"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 #, fuzzy
 msgid "New Private Message"
 msgstr "_Odeslat soukromou zprávu"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, fuzzy, python-format
 msgid "From %s in room %s"
 msgstr "%s je nyní %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "Od %s"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "Příjemce %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Jednoduchá zpráva jako %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "Přijaté %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "XML Konzole"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, fuzzy, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Byl(a) jsi pozván(a) do místnosti %s od %s"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
@@ -731,7 +739,7 @@ msgstr ""
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "_Úpravy"
 
@@ -752,7 +760,7 @@ msgstr "Uživatel:"
 msgid "Description"
 msgstr "Popis: %s"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Vstoupit"
 
@@ -804,7 +812,7 @@ msgstr "Uloženo do: %s"
 msgid "File transfer completed"
 msgstr "Přenos soubor dokončen"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Otevřít obsahující složku"
 
@@ -912,7 +920,7 @@ msgstr "Odesílatel: "
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Pokračovat"
 
@@ -1217,8 +1225,8 @@ msgstr "Chcete přijmout tuto žádost?"
 msgid "error while sending"
 msgstr "chyba při odesílání"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Obecné"
 
@@ -1246,32 +1254,32 @@ msgstr "Uvidíte jej vždy jako odpojeného."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt s \"%s\" nebyl navázán"
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Ověřte spojení nebo zkuste později."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "Vaše heslo je neplatné"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálně jste připojen(a) bez vašeho OpenPGP klíče."
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 #, fuzzy
 msgid "Your personal information has been published successfully."
 msgstr "Záložka byla úspěšně přidána"
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1279,12 +1287,12 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 #, fuzzy
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
@@ -1598,7 +1606,7 @@ msgstr "Popis: %s"
 
 #: ../src/gtkgui.glade.h:11
 #, fuzzy
-msgid "<b>Format of a Chat Line</b>"
+msgid "<b>Format of a line</b>"
 msgstr "<b>Formát řádky rozhovoru</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1831,47 +1839,47 @@ msgid "Bold"
 msgstr "Tučné"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "_Připojit po startu Gajimu"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Zrušit přenos souboru"
 
-#: ../src/gtkgui.glade.h:74
-msgid "Cancels the selected file transfer"
-msgstr "Zruší vybraný přenos souboru"
-
 #: ../src/gtkgui.glade.h:75
-#, fuzzy
-msgid "Cancels the selected file transfer and removes incomplete file"
+msgid "Cancels the selected file transfer"
 msgstr "Zruší vybraný přenos souboru"
 
 #: ../src/gtkgui.glade.h:76
 #, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr "Zruší vybraný přenos souboru"
+
+#: ../src/gtkgui.glade.h:77
+#, fuzzy
 msgid "Chan_ge Password"
 msgstr "Změnit heslo"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Změnit heslo"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Změ_nit přezdívku"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Změnit _předmět"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "_Upozornění o stavu rozhovoru:"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Rozhovor s"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Ověř dostupnost nové _verze při spuštění aplikace"
@@ -2006,106 +2014,102 @@ msgid "Display status messages of contacts in roster"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "E-mail"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Upravit skupiny"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "Upravit osobní informace..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Upravit _skupiny"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Povolit"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Zadejte znovu pro ověření:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Zadejte heslo:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Události"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Každých 5 _minut"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Další adresa:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Rodina:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Přenosy souborů"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Přenosy souborů"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Správce souborů:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtr:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 #, fuzzy
 msgid "Font style:"
 msgstr "Písmo:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Písmo:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formát: RRRR-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 #, fuzzy
 msgid "G_o"
 msgstr "Jdi"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Úprava témat Gajimu"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2114,7 +2118,7 @@ msgstr ""
 "Pokud bude zaškrtnuto, Gajim bude ohlašovat svoji schopnost posílat a "
 "přijímat meta-informace vztahující se k rozhovoru, například píšu zprávu"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2122,14 +2126,14 @@ msgstr ""
 "Gajim automaticky zobrazí nově přijatou zprávu v novém okně nebo v záložce "
 "existujícího rozhovoru"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
 msgstr ""
 "Gajim Vás upozorní o nové zprávě pomocí popupu v pravém dolním rohu obrazovky"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2137,7 +2141,7 @@ msgstr ""
 "Gajim Vás upozorní o nově připojených kontaktech pomocí popupu v pravém "
 "dolním rohu obrazovky"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2145,82 +2149,82 @@ msgstr ""
 "Gajim Vás upozorní o přávě odpojených kontaktech pomocí popupu v pravém "
 "dolním rohu obrazovky"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim pouze změní ikonu kontaktu, který odeslal novou zprávu"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 #, fuzzy
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Průvodce prvními krůčky"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Křestní:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Skupina:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "HTTP připojení"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Skryje okno"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Dom. stránka:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Počítač: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "Už mám účet který bych rád(a) použil(a)"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Chtěl(a) bych za_registrovat nový účet"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Chtěla bych si Vás přidat do mého Seznamu."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Pokud bude zaškrtnuto, Gajim bude mít také ikonu v traybaru"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Pokud bude zaškrtnuto, Gajim si bude pamatovat heslo pro tento účet"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2228,7 +2232,7 @@ msgstr ""
 "Pokud bude zaškrtnuto, Gajim si bude pamatovat polohy a velikosti Seznamu a "
 "oken rozhovorů po příštím spuštění"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2236,7 +2240,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim nahradí ascii smajlíky jako ':)' za ekvivalentní "
 "grafické smajlíky"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2244,7 +2248,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim bude posílat keep-alive pakety, aby předešel ztrátě "
 "spojení způsobenou nečinností"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 #, fuzzy
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -2253,7 +2257,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim uloží heslo v ~/.gajim/config s právem čtení pouze "
 "pro Vás a samosebou administrátora"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2263,21 +2267,21 @@ msgstr ""
 "z MSN bude mít odpovídající ikonu msn pro stavy připojen, pryč, nerušit, "
 "atd...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr ""
 "Pokud zaškrtnuto, Gajim po spuštění se automaticky připojí pomocí tohoto účtu"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2285,181 +2289,181 @@ msgstr ""
 "Máte-li 2 nebo více účtů a je zaškrtnuto, Gajim zobrazí všechny kontakty "
 "jako by byly z jednoho účtu"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Příchozí zpráva:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Info/Query"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 #, fuzzy
 msgid "Information about you, as stored in the server"
 msgstr "Informace o Vás, uložené na serveru jako vCard"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Latinka"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "Vstoupit do _Diskuze"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Poloha"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Ukládat historii"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Spravuj účty"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Spravuj záložky"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Spravuj smajlíky"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Spravuj profily Proxy"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Spravovat..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Střední:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "Mo_derátor"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Více"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Jméno:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Nová verze Gajimu je k dispozici"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Přezdívka"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Žádný"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Upozorni mě na kontakty které se: "
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "Při každé _zprávě"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Otevři stránku stahování"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Otevřít..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Šifrování"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "Nebo vyberte předdefinovanou zprávu:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Odchozí zpráva:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "He_slo:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 #, fuzzy
 msgid "Personal Information"
 msgstr "Upravit osobní informace..."
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Telefon:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "Přehrávat _zvuky"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Pozice:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "PSČ:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Nastavení"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Titul:"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Čas tisku:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "Priori_ta:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2469,18 +2473,22 @@ msgstr ""
 "serveru, pokud je připojeno více klientů přes stejný účet. Zprávu obdrží "
 "klient s vyšší prioritou"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Profil, Avatar"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Proxy:"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Nedávno:"
@@ -2578,105 +2586,105 @@ msgid "Send File"
 msgstr "Odeslat Soubor"
 
 #: ../src/gtkgui.glade.h:246
-#, fuzzy
-msgid "Send New Message"
-msgstr "Nová zpráva"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Odeslat jednoduchou _zprávu"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "Odeslat _Soubor"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 #, fuzzy
 msgid "Send _New Message..."
 msgstr "_Nová zpráva..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Odesílat keep-alive pakety"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Odeslat zprávu"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Odeslat zprávu a zavřít okno"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr "Poslat zprávu momentálně připojeným uživatelům tohoto serveru"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Vlastnosti serveru"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Nastavit MOTD"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Nastavit Zprávu dne"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Nastavit _Avatara"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Nastaví Zprávu dne"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "Zobrazit _odpojené kontakty"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Show _Roster"
 msgstr "Zobrazit pouze v _Seznamu"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "_XML konzole"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Zobrazit pouze v _Seznamu"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Zobrazí výpis přenosů souborů mezi Vámi a ostatními"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "_Přihlásí"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "_Odhlásí"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Seřadit podle stavu"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Stav"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Začít _rozhovor"
@@ -2685,7 +2693,7 @@ msgstr "Začít _rozhovor"
 msgid "State:"
 msgstr "Stav:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Stav"
 
@@ -2853,338 +2861,344 @@ msgstr "Potřebujete účet pro připojení k síti Jabber."
 msgid "Your JID:"
 msgstr "Vaše JID:"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Akce"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "Přid_at kontakt..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "Přid_at do Seznamu"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Správce"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Správce"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "_Rozšířené"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Autorizuj"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid "_Background:"
 msgstr "Barva pozadí"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "_Zakázat"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "_Přidej do záložek"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "_Prohlížeč:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "_Zjednodušený pohled    Alt+C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 #, fuzzy
 msgid "_Contents"
 msgstr "_Pokračovat"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "_Kopírovat JID/Emailovou adresu"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Kopírovat odkaz"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "O_dmítnout"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_Filter:"
 msgstr "Filtr:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Dokončit"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Group Chat"
 msgstr "Diskuze"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "Zvýrazňovat _slova s překlepy"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_Historie"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Počítač:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Ikona v systrayi (jinak řečeno v oznamovací oblasti)"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovat události od kontaktů mimo můj Seznam"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 #, fuzzy
 msgid "_Join New Room..."
 msgstr "Nová místnost"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "Vy_kopnout"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "E-_mailový klient:"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "Č_len"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "_Spojit účty"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Zpráva"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "_Upravit"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 #, fuzzy
 msgid "_Modify Account..."
 msgstr "Upravit úč_et..."
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Jméno: "
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Nikdy"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "_Upozornit mě"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Upozornit mě po dokončení přenosu souboru"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "_Akce účastníků"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "_Připojení uživatelé"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Otevři Emailový editor"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "_Otevřít v prohlížeči"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "_Vlastník"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Pauza"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Přehrávač:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "Zobrazit _popup"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Nastavení"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Zveřejnit"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Konec"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "Odst_ranit"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "Odst_ranit ze Seznamu"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Získat"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "Ode_slat"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "Ode_slat a zavřít"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "_Odeslat soukromou zprávu"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "Ode_slat zprávu serveru"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "Ode_slat jednoduchou zprávu"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "_Nastavit obrázek..."
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "_Začít rozhovor"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Stav"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Žádat autorizaci"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Autorizace"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Používat proxy"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "_Uživatel:"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Hlas"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "_XML konzole..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "výpis přenosů souborů"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "minut"
 
@@ -3209,27 +3223,41 @@ msgstr ""
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Stav:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Zpráva"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historie rozhovorů s %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%s je nyní %s (%s)"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status je nyní %s: %s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je nyní %s: %s"
@@ -3299,7 +3327,7 @@ msgstr "_Spojit účty"
 msgid "You are already in room %s"
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 #, fuzzy
 msgid "You cannot join a room while you are invisible"
 msgstr "Nemůžete vstoupit do diskuze pokud nejste připojen(a)."
@@ -3323,98 +3351,98 @@ msgstr "do účtu %s"
 msgid "using %s account"
 msgstr "pomocí účtu %s"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "jako %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "pro účet %s"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "pro účet %s"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s je nyní %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr "Už více nebudete moci posílat i přijímat zprávy od kontaktů z %s."
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Rád bych si Vás přidal(a) do svého seznamu"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 #, fuzzy
 msgid "Re_name"
 msgstr "Přejmenovat"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "Přih_lásit"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "_Odhlásit"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 #, fuzzy
 msgid "_Change Status Message"
 msgstr "Text stavu %s"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš status."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Pokud \"%s\" povolí Vaši žádost o autorizaci, budete vidět jeho status."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Uvidíte jej vždy jako odpojeného."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude smazán z Vašeho rosteru"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -3423,60 +3451,60 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt \"%s\" Váš uvidí vždy "
 "jako odpojen."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Zadej heslo GPG klíče pro účet %s"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Uložit heslo"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte vytvořit účet před tím, než budete moci hovořit s jinými uživateli."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3484,7 +3512,7 @@ msgstr ""
 "Zprávy bude možné číst později pouze v případě, budete-li mít povolenou "
 "historii."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 #, fuzzy
 msgid "Change Status Message..."
 msgstr "Text stavu %s"
@@ -3496,16 +3524,17 @@ msgstr "Text stavu %s"
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "jako "
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "účet: "
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 #, fuzzy
 msgid "Hide this menu"
 msgstr "Skryje okno"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr "Všechny kontakty v této skupině jsou odpojeni nebo mají závadu"
 
@@ -3545,29 +3574,29 @@ msgstr ""
 "Pokud zavřete tuto záložku a historie je vypnutá, zpráva bude ztracena."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Va¹e zpráva nemù¾e být odeslána dokud se nepøipojíte."
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "U¾ nejste v místnosti \"%s\" nebo \"%s\" ode¹el(a)."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Šifrování zapnuto"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Šifrování vypnuto"
 
@@ -3882,228 +3911,228 @@ msgid ""
 "his or her status and/or his status message."
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Jím"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Právě jím, prosím zanechte mi zprávu."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Pracuji"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Venku"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Užívám si života venku"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 #, fuzzy
 msgid "marine"
 msgstr "minut"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr ""
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Nelze vstoupit do místnosti"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr ""
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 #, fuzzy
 msgid "You are banned from this room."
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr ""
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr ""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "jsme registrování k %s"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "žádost o zrušení autorizace od %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "autorizace zrušena od %s"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojení s účtem \"%s\" bylo ztraceno"
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Pro pokračování v přijímání a odesílání zpráv se musíte znovu připojit."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, fuzzy, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Připojen k server s %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Ověřte připojení nebo zkuste později"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Prosím zkontrolujte správnost jména a hesla."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP heslo nebylo zadáno"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Budete připojen(a) k %s bez OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "neviditelný"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "odpojen"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "Jsem %s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Tato zpráva je zašifrovaná]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4112,17 +4141,17 @@ msgstr ""
 "Předmět: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 #, fuzzy
 msgid "Timeout"
 msgstr "Téma"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr ""
 
@@ -4352,6 +4381,29 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nemůžu otevřít %s pro čtení"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Nová zpráva jako %s"
+
+#~ msgid "Chat with"
+#~ msgstr "Rozhovor s"
+
+#~ msgid "E-Mail"
+#~ msgstr "E-mail"
+
+#, fuzzy
+#~ msgid "Send New Message"
+#~ msgstr "Nová zpráva"
+
+#~ msgid "as %s"
+#~ msgstr "jako %s"
+
+#~ msgid "as "
+#~ msgstr "jako "
+
 #, fuzzy
 #~ msgid "Send _New Message"
 #~ msgstr "_Nová zpráva"
diff --git a/po/de/LC_MESSAGES/gajim.po b/po/de/LC_MESSAGES/gajim.po
index 5eeb11dcd..3aa25ce6a 100644
--- a/po/de/LC_MESSAGES/gajim.po
+++ b/po/de/LC_MESSAGES/gajim.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-11-26 19:17+0100\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Ein GTK+ Jabber-Client"
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -50,39 +50,40 @@ msgstr "(Kein"
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Gruppenchat"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "Konto: "
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "Nicht in der Liste"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Wechseln zu %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -98,229 +99,231 @@ msgstr ""
 "\n"
 "Falschgeschriebene Wörter werden nicht hervorgehoben"
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Alle %s _Minuten"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Sound"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "Statusnachricht"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Wav Dateien"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "Verbindung muss beendet werden, um Kontonamen zu ändern."
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Kontoname darf nicht leer sein."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber ID"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID muss in der Form \"user@servername\" sein."
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "Proxy Port muss eine Portnummer sein."
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Account nicht verfügbar"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Sie müssen ein Konto erstellen bevor Sie die persönlichen Informationen "
 "ändern können"
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Sie müssen angemeldet sein, um Ihre persönlichen Informationen zu bearbeiten"
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Holen der geheimen Schlüssel fehlgeschlagen"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Es gab ein Problem beim Holen ihres geheimen OpenPGP Schlüssels."
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie ihren OpenPGP Schlüssel"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Kein Schlüssel gewählt"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Server"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Transports"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "%s ändern"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Text"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Bild"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "Das Bild ist zu groß"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
 msgstr ""
 "Das Bild darf eine Höhe und Breite von je 24 Pixeln nicht überschreiten."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" ist mit Server verbunden"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Neuer Raum"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Dieser Bookmark hat ungültige Daten"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Bitte Serverfeld und Raumfeld ausfüllen oder Bookmark löschen."
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Sie müssen einen Benutzernamen angeben, um diesen Account zu konfigurieren."
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Sie müssen ein Passwort für das neue Konto eingeben."
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 msgid "Account has been added successfully"
 msgstr "Account wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -329,19 +332,19 @@ msgstr ""
 "oder durchklicken des Konto-Menüpunktes im Bearbeiten-Menü des Hauptfensters "
 "erreichen."
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Kontoname ist schon vergeben"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
@@ -387,13 +390,14 @@ msgid "Yesterday"
 msgstr "Gestern"
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr "Vor %i Tagen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
@@ -489,27 +493,26 @@ msgstr "Abonnement-Anforderung von %s"
 msgid "You can not join a group chat unless you are connected."
 msgstr "Sie können einem Chatraum erst beitreten, wenn Sie verbunden sind."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Betrete Chatraum als %s"
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Betrete Chatraum"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Neue Nachricht als %s"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "für Konto %s"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Neue Nachricht"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "Chat starten"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -518,129 +521,134 @@ msgstr ""
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Sie müssen verbunden sein, um Ihr Passwort zu ändern"
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Benutzer hat sich abgemeldet"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Neue Nachricht"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, python-format
 msgid "From %s in room %s"
 msgstr "Von %s in Raum %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "Von %s"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Dateitransfer Anfrage"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Dateitransfer-Fehler"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Dateitransfer beendet"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Dateitransfer gestoppt"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "An %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Einzelne Nachricht als %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "%s empfangen"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsole für %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "XML Konsole"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Sie wurden in den Raum %(room_jid)s von %(contact_jid)s eingeladen"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -703,7 +711,7 @@ msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "_Ändern"
 
@@ -722,7 +730,7 @@ msgstr "Benutzer"
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Betreten"
 
@@ -773,7 +781,7 @@ msgstr "Absender: %s"
 msgid "File transfer completed"
 msgstr "Dateitransfer abgeschlossen"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Öffne Ordner"
 
@@ -878,7 +886,7 @@ msgstr "Absender: "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Fortsetzen"
 
@@ -1182,8 +1190,8 @@ msgstr "Akzeptieren Sie diese Anfrage?"
 msgid "error while sending"
 msgstr "Fehler beim Senden"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Allgemein"
 
@@ -1210,32 +1218,32 @@ msgstr "Sie werden den Kontakt ab sofort als offline sehen."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt mit \"%s\" konnte nicht hergestellt werden"
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr ""
 "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "Ihre Passphrase ist falsch"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sie wurden ohne ihren GPG-Schlüssel verbunden"
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr "vCard erfolgreich veröffentlicht"
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "Your personal information has been published successfully."
 msgstr "Ihre persönlichen Informationen wurden erfolgreich veröffentlicht."
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr "vCard Veröffentlichung fehlgeschlagen"
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1245,11 +1253,11 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sitzungsmanagment-Unterstützung nicht verfügbar (fehlendes gnome.ui Modul)"
@@ -1593,7 +1601,8 @@ msgid "<b>Description</b>"
 msgstr "<b>Beschreibung</b>"
 
 #: ../src/gtkgui.glade.h:11
-msgid "<b>Format of a Chat Line</b>"
+#, fuzzy
+msgid "<b>Format of a line</b>"
 msgstr "<b>Format einer Chat-Zeile</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1829,46 +1838,46 @@ msgid "Bold"
 msgstr "Fett"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "Beim Pr_ogrammstart verbinden"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Dateitransfer abbrechen"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Bricht den ausgewählten Dateitransfer ab"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr ""
 "Bricht den ausgewählten Dateitransfer ab und löscht unvollständige Daten"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Pass_wort ändern"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "_Spitzname ändern"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "_Thema ändern"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Sende Statusbenachrichtigungen:"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Unterhalten mit"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Beim Start von Gajim auf neue _Versionen prüfen"
@@ -2004,104 +2013,100 @@ msgid "Display status messages of contacts in roster"
 msgstr "Zeige die Statusnachricht von Kontakten im Roster"
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Gruppen bearbeiten"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "Persönliche _Details bearbeiten..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "_Gruppen bearbeiten"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Einschalten"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Erneut eingeben zur Bestätigung:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Neues Passwort eingeben:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Ereignisse"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Alle 5 _Minuten"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Zusatz-Adresse:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Nachname:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Dateitransfers"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Dateitransfers"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Dateimanager:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Schriftart:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Schriftart:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: JJJJ-MM-TT"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Häufig gestellte Fragen (online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Von:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "_Los"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Gajim Thema Einstellungen"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2109,7 +2114,7 @@ msgstr ""
 "Gajim kann Meta-Information, die eine Unterhaltung mit einem Kontakt "
 "betrifft, empfangen und versenden"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2117,7 +2122,7 @@ msgstr ""
 "Gajim zeigt die neu erhaltene Nachricht in einem neuen Chat-Fenster oder "
 "einem Reiter in einem existieren Chat-Fenster"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2125,7 +2130,7 @@ msgstr ""
 "Gajim wird Sie über neue Nachrichten mit einem Popup in der rechten unteren "
 "Ecke des Bildschirms benachrichtigen"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2133,7 +2138,7 @@ msgstr ""
 "Gajim wird Sie über ein Popup-Fenster in der rechten unteren Ecke des "
 "Bildschirmes über Kontakte informieren, die sich gerade angemeldet haben"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2141,69 +2146,69 @@ msgstr ""
 "Gajim wird Sie über ein Popup-Fenster in der rechten unteren Bildschirmecke "
 "über Kontakte informieren, die sich gerade abgemeldet haben"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajim wird nur das Symbol des Kontaktes ändern, von dem die neue Nachricht "
 "kommt"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontoeinrichtungs-Wizard"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Vorname:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "HTTP Connect"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr "Online-Hilfe"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Schließt das Fenster"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Hostname: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "Ich habe bereits ein Konto, das ich benutzen möchte"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Ich möchte ein neues Konto _erstellen"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Ich würde Dich gerne zu meiner Kontaktliste hinzufügen."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Wenn gewählt wird Gajim ein Tray-Symbol verwenden"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
 msgstr "Wenn aktiviert, wird Gajim einen Avatar einblenden"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -2211,15 +2216,15 @@ msgstr ""
 "Wenn aktiviert wird Gajim für jeden Kontakt im Roster eine Statusnachricht, "
 "falls nicht leer, unter dem jeweiligen Kontaktnamen anzeigen"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Wenn gewählt tritt Gajim dem Chatraum beim Programmstart bei"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Falls gewählt, speichert Gajim das Passwort für dieses Konto"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2227,7 +2232,7 @@ msgstr ""
 "Wenn gewählt, merkt sich Gajim die Position und Größe der Kontaktliste auf "
 "dem Bildschirm"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2235,7 +2240,7 @@ msgstr ""
 "Wenn gewählt wird Gajim ASCII-Smilies wie ':)' mit äquivalenten graphischen "
 "Emoticons ersetzen"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2243,7 +2248,7 @@ msgstr ""
 "Wenn aktiviert, sendet Gajim regelmäßig keep-alive-Pakete um den "
 "Verbindungsabbruch aufgrund einer Zeitüberschreitung zu verhindern"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2251,7 +2256,7 @@ msgstr ""
 "Wenn Sie diese Option wählen, wird Gajim das Passwort in ~/.gajim/config mit "
 "'lese' -Rechten nur für Sie"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2261,7 +2266,7 @@ msgstr ""
 "verwenden (Ein Kontakt aus MSN wird z.B. das äquivalente MSN-Symbol für den "
 "Status \"Anwesend\", \"Abwesend\", \"Beschäftigt\", etc... haben)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2269,7 +2274,7 @@ msgstr ""
 "Wenn Sie diese Option wählen, wird Gajim während des Startvorgangs "
 "automatisch zu diesem Konto verbinden"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 "
@@ -2279,7 +2284,7 @@ msgstr ""
 "Combobox am Fuße des Kontaktfenster) auch den Status dieses Kontakts "
 "entsprechend ändern"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2287,179 +2292,179 @@ msgstr ""
 "Wenn Sie zwei oder mehr Konten haben und diese Option gewählt ist, wird "
 "Gajim alle Kontakte auflisten, als hätten Sie ein Konto"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Eingehende Nachricht:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Info/Query"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 msgid "Information about you, as stored in the server"
 msgstr "Informationen über Sie, wie sie auf dem Server gespeichert sind"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr "Einladung empfangen"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "_Chatraum beitreten"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Ort"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Log-Verlauf"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Konten Verwalten"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Verwalte Bookmarks"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Emoticons anpassen"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Proxy Verwaltung"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Verwalten..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Mittelname"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Mehr"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Es ist eine neue Version von Gajim verfügbar"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Spitzname:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Kein"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Über Kontakte benachrichtigen, die sich "
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "BS:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "In jeder _Zeile"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Download-Seite öffnen"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Öffnen..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP-Verschlüsselung"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "Oder wählen Sie eine voreingestellte Nachricht:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Ausgehende Nachricht:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "Pass_wort:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 msgid "Personal Information"
 msgstr "Persönliche Details bearbeiten..."
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Telefon-Nr.:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "_Klänge abspielen"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Position:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "Postleitzahl:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Einstellungen"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Präfix"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Zeit anzeigen:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "Priori_tät:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2470,18 +2475,22 @@ msgstr ""
 "selben Konto verbunden sind. Der Client mit der höchsten Priorität bekommt "
 "die Ereignisse"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Profile, Avatar"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Proxy:"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Kürzlich:"
@@ -2580,101 +2589,102 @@ msgid "Send File"
 msgstr "Datei Senden"
 
 #: ../src/gtkgui.glade.h:246
-msgid "Send New Message"
-msgstr "Sende Neue Nachricht"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Einzelne Nachricht Senden"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "_Datei Senden"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 msgid "Send _New Message..."
 msgstr "Sende _neue Nachricht..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Sende keep-alive Pakete"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Nachricht senden"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Nachricht senden und Fenster schließen"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr "Sendet eine Nachricht an momentan angemeldete Benutzer des Servers"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Fähigkeiten des Servers"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Setze MOTD"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Setze Message of the Day"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "_Avatar wählen"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr "Verwende einen Avater, wenn ich mich verbinde"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Setzt Message of the Day"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr "Zeige alle schwebenden _Ereignisse"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "_Abgemeldete Kontakte anzeigen"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 msgid "Show _Roster"
 msgstr "_Roster anzeigen"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 msgid "Show _XML Console"
 msgstr "Zeige _XML Konsole"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Nur in der _Kontaktliste anzeigen"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Zeigt eine Liste von Dateitransfers"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "_anmelden"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "a_bmelden"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Kontakte nach Status sortieren"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Status"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "_Chat starten"
@@ -2683,7 +2693,7 @@ msgstr "_Chat starten"
 msgid "State:"
 msgstr "Staat:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Status"
 
@@ -2852,333 +2862,339 @@ msgstr ""
 msgid "Your JID:"
 msgstr "Ihre JID:"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Aktionen"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "Kontakt _Hinzufügen..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "Zur Kont_aktliste hinzufügen"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "Erweitert"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Autorisieren"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Background:"
 msgstr "_Hintergrund:"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "_Verbannen"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "Raum zu _Bookmarks hinzufügen"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "_Kompakte Ansicht Alt+C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Contents"
 msgstr "In_halte"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "Email-Adresse _kopieren"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "Link-Adresse _kopieren"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "_Ablehnen"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr "_Dienste durchsuchen"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr "_Durchsuche Dienste..."
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Beenden"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Group Chat"
 msgstr "_Gruppenchat"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "Falsch geschriebene Wörter _hervorheben"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_Verlauf"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Server:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "_Info/Query"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "Symbol im Systemabschn_itt (Benachrichtigungs-Bereich)"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Ereignisse von Kontakten, die nicht in der Liste sind, _ignorieren"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Join New Room..."
 msgstr "_Neuen Raum betreten"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "_Rausschmeißen"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 #, fuzzy
 msgid "_Log status changes of contacts"
 msgstr "Zeige die Statusnachricht von Kontakten im Roster"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "_Mail-Programm:"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Mitglied"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "Konten _zusammenführen"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "_Ändern"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Modify Account..."
 msgstr "Konto bearbeiten"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Name: "
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Nie"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "Be_nachrichtigen"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Benachrichtige mich, wenn der Dateitransfer abgeschlossen ist"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "_Benutzer Aktionen"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "_Angemeldete Benutzer"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "Email-Programm _öffnen"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "Link _öffnen"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "_Besitzer"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Player:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "_Öffnen"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Präsenz"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Veröffentlichen"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "Entfernen von _Kontaktliste"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "Antwo_rten"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "Ab_rufen"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "_Senden"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "_Senden & Schließen"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "Private Nachricht _Senden"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "_Sende Servernachricht"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "Sende _einzelne Nachricht"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "Bild wählen..."
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "Chat starten"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "Abonnement"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Proxy benutzen"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "_Benutzername:"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Stimme verleihen"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "_XML Konsole..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "Dateitransfer-Liste"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "Minuten"
 
@@ -3205,27 +3221,41 @@ msgstr ""
 "Konnte nicht an %s schreiben. Sitzungmanagment-Unterstützung wird nicht "
 "funktionieren"
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Staat:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Nachricht"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Unterhaltungs-Verlauf mit %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ist jezt %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ist jetzt %(status)s\n"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status ist jetzt: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status ist jetzt: %(status)s\n"
@@ -3295,7 +3325,7 @@ msgstr "Konten zusammenführen"
 msgid "You are already in room %s"
 msgstr "Sie sind bereits im Raum %s"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 msgid "You cannot join a room while you are invisible"
 msgstr "Sie können einem Chatraum nicht beitreten, wenn Sie unsichtbar sind."
 
@@ -3317,27 +3347,27 @@ msgstr "an %s Konto"
 msgid "using %s account"
 msgstr "mit %s Konto"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "als %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "für Konto %s"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "für Konto %s"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s ist jetzt %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3345,68 +3375,68 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten von diesem Transport "
 "austauschen."
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel Zuweisen"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Ich würde dich gerne in meine Liste aufnehmen"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 msgid "Re_name"
 msgstr "_Umbenennen"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "_Anmelden"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "_Abmelden"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt ihren Status."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Wenn d\"%s\" diese Anfrage akzeptiert, erfahren Sie dessen Status."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sie werden den Kontakt ab sofort als offline sehen."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3414,42 +3444,42 @@ msgstr ""
 "Durch die Entfernung dieses Kontaktes entziehen Sie ihm auch die "
 "Authorisation, wodurch der Kontakt sie nur noch als offline sehen wird."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr ""
 "I möchte, dass dieser Kontakt meinen Status auch nach der Entfernung sieht"
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geben Sie ihr Passwort für %s ein"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Geben Sie die GPG-Passphrase für das Konto %s ein"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Passphrase speichern"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3457,27 +3487,27 @@ msgstr ""
 "Wenn Sie Ihren Status auf unsichtbar setzen, werden sie von diesen "
 "Gruppenchats getrennt. Sind Sie sicher, dass sie unsichtbar werden möchten?"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie zum Jabber-Netzwerk verbinden "
 "können."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr "Um Nachrichten später lesen zu können, muss der Verlauf aktiv sein."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht..."
 
@@ -3487,15 +3517,16 @@ msgstr "Ändere _Statusnachricht..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "als "
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "Konto: "
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 msgid "Hide this menu"
 msgstr "Versteckt dieses Menü"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr "Alle Kontakte dieser Gruppe sind abgemeldet oder haben Fehler"
 
@@ -3537,29 +3568,29 @@ msgstr ""
 "Nachricht verloren."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Sie sind nicht mehr im Raum \"%s\" oder \"%s\" hat den Raum verlassen."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Verschlüsselung aktiviert"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Verschlüsselung deaktiviert"
 
@@ -3898,59 +3929,59 @@ msgstr ""
 "Falls deaktiviert, werden Sie keine Statuszeile im Chat sehen, wenn ein "
 "Kontaktseinen Status und/oder seine Statusnachricht ändert."
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade, also hinterlasst eine Nachricht."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Arbeit"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Ich bin draußen und genieße das Leben"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -3959,7 +3990,7 @@ msgstr ""
 "muc_highlights_works-Liste enthält oder wenn die Nachricht Ihren Nickname "
 "erhält."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -3968,61 +3999,61 @@ msgstr ""
 "wirdnur beachtet, wenn notify_on_all_muc_messages aktiviert ist)"
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr "gemüse"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr "menschlich"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr "plain"
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Fehler beim Betreten des Raum"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr "Für das Betreten dieses Raumes ist ein Passwort nötig."
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 msgid "You are banned from this room."
 msgstr "Sie sind aus diesem Raum gebannt"
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr "Dieser Raum existiert nicht."
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr "Raumerstellung ist beschränkt"
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr "Sie müssen Ihren registrierten Spitznamen verwenden"
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 msgid "You are not in the members list."
 msgstr "Sie sind nicht in der Mitgliedliste"
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4031,100 +4062,100 @@ msgstr ""
 "Benutzer registriert.\n"
 "Bitte geben Sie einen anderen Benutzernamen an:"
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Ich würde dich gerne zu meiner Liste hinzufügen."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "wir haben jetzt %s abonniert"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Anfrage zur Kündigung des Abonnements von %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s hat das Abonnement beendet"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Um weiter Senden um Empfangen zu können, müssen Sie sich erneut verbinden."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Konnte nicht mit %s verbinden"
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Verbunden mit Server %s:%s mit %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Bitte überprüfen Sie ihren Benutzernamen und Passwort."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "Keine OpenPGP-Passphrase gewählt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Sie werden ohne OpenPGP mit %s verbunden."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "unsichtbar"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "abgemeldet"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "Ich bin %s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Diese Nachricht ist verschlüsselt]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4133,17 +4164,17 @@ msgstr ""
 "Thema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Registrierungsinformation für Transport %s sind nicht rechtzeitig angekommen"
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr "Es ist ein Protkollfehler aufgetreten"
 
@@ -4363,6 +4394,28 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Neue Nachricht als %s"
+
+#~ msgid "Chat with"
+#~ msgstr "Unterhalten mit"
+
+#~ msgid "E-Mail"
+#~ msgstr "E-Mail"
+
+#~ msgid "Send New Message"
+#~ msgstr "Sende Neue Nachricht"
+
+#~ msgid "as %s"
+#~ msgstr "als %s"
+
+#~ msgid "as "
+#~ msgstr "als "
+
 #~ msgid "Send _New Message"
 #~ msgstr "Sende _neue Nachricht"
 
diff --git a/po/el/LC_MESSAGES/gajim.po b/po/el/LC_MESSAGES/gajim.po
index ac10912cd..9ab1af147 100644
--- a/po/el/LC_MESSAGES/gajim.po
+++ b/po/el/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-09-01 17:31+0300\n"
 "Last-Translator: Filippos Papadopoulos <filip@cs.uoi.gr>\n"
 "Language-Team: Hellenic-Ελληνικά-Greek\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -58,39 +58,40 @@ msgstr "Τίποτα"
 msgid "Hidden"
 msgstr "Μέσο:"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Κουβέντα"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Ομαδική Κουβέντα"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "λογαριασμός: "
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "εκτός λίστας επαφών"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Αλλαγή σε %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -106,168 +107,170 @@ msgstr ""
 "\n"
 "Η υπογράμμιση τυπογραφικών λαθών απενεργοποιήθηκε"
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Κάθε %s _λεπτά"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Ενεργοποιημένο"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Γεγονός"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Ήχος"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Επιλογή Ήχου"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Αρχεία Wav"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στον διακομιστή"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Το όνομα λογαριασμού δεν μπορεί να είναι κενό."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δεν μπορεί να έχει κενά."
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή\"."
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Μη έγκυρη καταχώρηση"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε τον λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες"
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στον διακομιστή"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
 "πληροφορίες"
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Σφάλμα κατά την λήψη μυστικών κλειδιών"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Σφάλμα κατά την λήψη του OpenPGP μυστικών κλειδιών σας."
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Κωδικοφράση"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Επιλέξτε το OpenPGP κλειδί σας"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Καμία επιλογή κλειδιού"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Διακομιστής"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Μεταφορές"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Εικόνα"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "Η εικόνα είναι πολύ μεγάλη"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -275,67 +278,67 @@ msgstr ""
 "Η εικόνα για τα σύμβολα πρέπει να είναι μικρότερη ή ίση με 24 pixel σε μήκος "
 "και 24 pixel σε ύψος."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Επιλογή Εικόνας"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαιρώντας τον λογαριασμό %s"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με τον διακομιστή"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Νέο Δωμάτιο"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά "
 "αφαιρέστε τον σελιδοδείκτη."
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 #, fuzzy
 msgid "Invalid username"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 #, fuzzy
 msgid "You must provide a username to configure this account."
 msgstr "Πρέπει να δώσετε ένα όνομα χρήστη για προσθήκη νέου λογαριασμού."
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Πρέπει να δώσετε έναν κωδικό για τον νέο λογαριασμό."
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 #, fuzzy
 msgid "Account has been added successfully"
 msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
@@ -345,20 +348,20 @@ msgstr ""
 "Μπορείτε να δείτε όλες τις ρυθμίσεις του λογαριασμού σας κάνοντας "
 "\"Επεξεργασία->Λογαριασμοί\" από το κεντρικό παράθυρο"
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 #, fuzzy
 msgid "Your new account has been created successfully"
 msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
@@ -402,13 +405,14 @@ msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
@@ -513,27 +517,26 @@ msgstr ""
 "Δεν μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Συμμετοχή σε Ομαδική Συζήτηση ως %s"
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε Ομαδική Συζήτηση"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Νέο Μήνυμα ως %s"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "για τον λογαριασμό %s"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Νέο Μήνυμα"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "_Έναρξη κουβέντας"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -542,130 +545,135 @@ msgstr ""
 "θέλετε να στείλετε ένα μήνυμα συζήτησης"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας"
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Σύνδεση Επαφής"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση Επαφής"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Νέο Μήνυμα"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Νέο Μονό Μήνυμα"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 #, fuzzy
 msgid "New Private Message"
 msgstr "_Αποστολή Προσωπικού Μηνύματος"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, fuzzy, python-format
 msgid "From %s in room %s"
 msgstr "Ο %s είναι τώρα %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "Από %s"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Η Μεταφορά Αρχείου Ολοκληρώθηκε"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Η Μεταφορά Αρχείου Διακόπηκε"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "σε %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Μονό Μήνυμα ως %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Μονό Μήνυμα"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "Έγινε λήψη του %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Κονσόλα για %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, fuzzy, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Έχετε προσκληθεί στο δωμάτιο %s από τον/την %s"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
@@ -729,7 +737,7 @@ msgstr ""
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "Επε_ξεργασία"
 
@@ -750,7 +758,7 @@ msgstr "Ταυτότητα Χρήστη:"
 msgid "Description"
 msgstr "Περιγραφή: %s"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
@@ -802,7 +810,7 @@ msgstr "Αποθηκεύτηκε στο: %s"
 msgid "File transfer completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Άνοιγμα του περιέχοντος φακέλου"
 
@@ -910,7 +918,7 @@ msgstr "Αποστολέας: "
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Συνέχεια"
 
@@ -1227,8 +1235,8 @@ msgstr "Δέχεστε αυτό το αίτημα;"
 msgid "error while sending"
 msgstr "σφάλμα κατά την αποστολή"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Γενικά"
 
@@ -1256,32 +1264,32 @@ msgstr "Θα βλέπετε την επαφή πάντα ως αποσυνδεδ
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Ελέγξτε την σύνδεση σας ή δοκιμάστε αργότερα."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "H κωδική φράση είναι λανθασμένη"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Είστε συνδεδεμένοι χωρίς την χρήση του OpenPGP κλειδιού σας"
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 #, fuzzy
 msgid "Your personal information has been published successfully."
 msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1289,12 +1297,12 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 #, fuzzy
 msgid "Could not save your settings and preferences"
 msgstr "Αδυναμία αποθήκευσης των προτιμήσεων σας"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
@@ -1610,7 +1618,7 @@ msgstr "Περιγραφή: %s"
 
 #: ../src/gtkgui.glade.h:11
 #, fuzzy
-msgid "<b>Format of a Chat Line</b>"
+msgid "<b>Format of a line</b>"
 msgstr "<b>Μορφή μια γραμμής κουβέντας</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1847,47 +1855,47 @@ msgid "Bold"
 msgstr "Έντονα"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Ακύρωση της μεταφοράς αρχείου"
 
-#: ../src/gtkgui.glade.h:74
-msgid "Cancels the selected file transfer"
-msgstr "Ακυρώνει την επιλεγμένη μεταφορά αρχείου"
-
 #: ../src/gtkgui.glade.h:75
-#, fuzzy
-msgid "Cancels the selected file transfer and removes incomplete file"
+msgid "Cancels the selected file transfer"
 msgstr "Ακυρώνει την επιλεγμένη μεταφορά αρχείου"
 
 #: ../src/gtkgui.glade.h:76
 #, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr "Ακυρώνει την επιλεγμένη μεταφορά αρχείου"
+
+#: ../src/gtkgui.glade.h:77
+#, fuzzy
 msgid "Chan_ge Password"
 msgstr "Αλλαγή Κωδικού"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Αλλαγή Κωδικού"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Αλλαγή _Ψευδώνυμου"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Αλλαγή _Θέματος"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Κουβέντα με"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Έλεγχος για _νέα έκδοση κατά την εκκίνηση του Gajim"
@@ -2025,106 +2033,102 @@ msgid "Display status messages of contacts in roster"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "Ε-Mail"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Τροποποίηση Ομάδων"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "Τροποποίηση Προσωπικών Πληροφοριών..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Επεξεργασία _Ομάδων"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Επαναπληκτρολογήστε για επιβεβαίωση:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Πληκτρολογήστε νέο κωδικό:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Γεγονότα"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Κάθε 5 _λεπτά"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Επιπλέον Οδός:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Οικογένεια:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Μεταφορές Αρχείων"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Μεταφορές Αρχείων"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Διαχειριστής αρχείων:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Φιλτράρισμα:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 #, fuzzy
 msgid "Font style:"
 msgstr "Γραμματοσειρά:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Γραμματοσειρά:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Από:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 #, fuzzy
 msgid "G_o"
 msgstr "Πάμε"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Προσαρμογή Θεμάτων Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2134,7 +2138,7 @@ msgstr ""
 "λαμβάνει μετα-πληροφορίες σχετικές με μια συζήτηση που έχετε με μια επαφή. "
 "Μια τέτοια πληροφορία είναι π.χ. ότι κάποιος από τους δυο γράφει ένα μήνυμα"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2142,7 +2146,7 @@ msgstr ""
 "Το Gajim θα εμφανίσει αυτόματα το νέο εισερχόμενο μήνυμα σε ένα νέο παράθυρο "
 "κουβέντας ή σε μια καρτέλα ενός ήδη υπάρχοντος παραθύρου κουβέντας"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2150,7 +2154,7 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει για το νέο μήνυμα μέσω ενός αναδυόμενου "
 "παραθύρου στο κάτω δεξιά μέρος της οθόνης"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2158,7 +2162,7 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις συνδέθηκαν στο Jabber"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2166,85 +2170,85 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις αποσυνδέθηκαν στο Jabber"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Το Gajim θα αλλάξει μόνο το εικονίδιο της επαφής που έστειλε το μήνυμα"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 #, fuzzy
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Οδηγός Πρώτης Φοράς"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Δοθέν Όνομα"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Ομάδα:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "Σύνδεση HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Αποκρύπτει το παράθυρο"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Προσωπ. Σελίδα:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Κεντρικός υπολογιστής:"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "Έχω ήδη ένα λογαριασμό που θέλω να χρησιμοποιήσω"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr ""
 "Αν επιλεγεί, το Gajim θα έχει δικό του εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτή την ομαδική συζήτηση "
 "κατά την εκκίνηση"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Αν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2252,7 +2256,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα θυμάται την θέση και το μέγεθος του κύριου "
 "παραθύρου την επόμενη φορά που θα εκτελεστεί"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2260,7 +2264,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα μετατρέπει όλα ascii σύμβολα όπως το ':)' με τα "
 "αντίστοιχα γραφικά σύμβολα"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2268,7 +2272,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα στέλνει πακέτα keep-alive ώστε να αποφύγει την "
 "διακοπή της σύνδεσης"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 #, fuzzy
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -2277,7 +2281,7 @@ msgstr ""
 "Εάν επιλεγεί, το Gajim θα αποθηκεύσει τον κωδικό στο ~/.gajim/config με "
 "δικαίωμα ανάγνωσης μόνο για εσάς και φυσικά τον διαχειριστή του Η/Υ σας"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2287,7 +2291,7 @@ msgstr ""
 "πρωτόκολλο της επαφής. (πχ. Μια επαφή από το MSN θα έχει το αντίστοιχο msn "
 "εικονίδιο για τις καταστάσεις διαθέσιμος, απομακρυσμένος κλπ..)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2295,14 +2299,14 @@ msgstr ""
 "Εάν επιλεγεί, το Gajim, όταν εκτελεστεί, θα συνδεθεί αυτόματα στο Jabber "
 "χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2310,181 +2314,181 @@ msgstr ""
 "Αν έχετε 2 ή περισσότερους λογαριασμούς και έχει επιλεγεί, το Gajim θα "
 "εμφανίζει τις επαφές σας σαν να είχατε ένα λογαριασμό"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Εισερχόμενο μήνυμα:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Πληροφορία/Ερώτηση (Info/Query)"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 #, fuzzy
 msgid "Information about you, as stored in the server"
 msgstr "Οι πληροφορίες για εσάς αποθηκεύονται στον διακομιστή ως vCard"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Πλάγια"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "Συμμετοχή σε _Ομαδική Συζήτηση"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Περιοχή"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Καταγραφή ιστορικού"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Διαχείριση Λογαριασμών"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Διαχείριση Σελιδοδεικτών"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Διαχείριση Συμβόλων"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Διαχείριση Προφίλ Μεσολαβητή"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Διαχείριση..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Μέσο:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "_Συντονιστής"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Περισσότερα"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Μια νέα έκδοση του Gajim είναι διαθέσιμη"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Όνομα χρήστη:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Τίποτα"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "Λειτ. Σύστημα:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "Σε κάθε _μήνυμα"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Άνοιγμα Σελίδας Λήψης"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Άνοιγμα..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "Κρυπτογράφηση OpenPGP"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "Ή διαλέξτε από τα προκαθορισμένα μηνύματα:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Εξερχόμενο μήνυμα:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "_Κωδικός:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Κωδικός:"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 #, fuzzy
 msgid "Personal Information"
 msgstr "Τροποποίηση Προσωπικών Πληροφοριών..."
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Τηλέφωνο:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "Αναπαραγωγή _ήχων"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Θύρα: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Θέση:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "Τ.Κ.:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Πρόθεμα:"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Εμφάνιση χρόνου:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "Π_ροτεραιότητα:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2495,18 +2499,22 @@ msgstr ""
 "είναι συνδεδεμένες χρησιμοποιώντας τον ίδιο λογαριασμό· Η εφαρμογή με την "
 "μεγαλύτερη προτεραιότητα λαμβάνει τα γεγονότα"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Προφίλ, Avatar"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Πρωτόκολλο:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Μεσολαβητής:"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Πρόσφατα:"
@@ -2608,106 +2616,106 @@ msgid "Send File"
 msgstr "Αποστολή Αρχείου"
 
 #: ../src/gtkgui.glade.h:246
-#, fuzzy
-msgid "Send New Message"
-msgstr "Νέο Μήνυμα"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Αποστολή ενός _μηνύματος"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "Αποστολή _Αρχείου"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 #, fuzzy
 msgid "Send _New Message..."
 msgstr "_Νέο Μήνυμα..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Αποστολή πακέτων keep-alive"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Αποστολή μηνύματος"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Αποστολή μηνύματος και κλείσιμο παραθύρου"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr ""
 "Στέλνει ένα μήνυμα στους χρήστες που είναι συνδεδεμένοι σε αυτό το διακομιστή"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Διακομιστής:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Χαρακτηριστικά Διακομιστή"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Ορισμός MOTD"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Ορισμός Μηνύματος της Ημέρας"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Κα_θορισμός Avatar"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Ορίζει το Μήνυμα της Ημέρας (MOTD)"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "Εμφάνιση _Αποσυνδεδεμένων Χρηστών"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Show _Roster"
 msgstr "Εμφά_νισε το μόνο στο κύριο παράθυρο"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "Κονσόλα _XML"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Εμφά_νισε το μόνο στο κύριο παράθυρο"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Δείχνει τη λίστα μεταφορών αρχείων μεταξύ εσάς και άλλων"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "Σύν_δεση"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "Αποσ_ύνδεση"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Ταξινόμηση επαφών βάσει κατάστασης"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Κατάσταση"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Έναρξη _Συζήτησης"
@@ -2716,7 +2724,7 @@ msgstr "Έναρξη _Συζήτησης"
 msgid "State:"
 msgstr "Νομός:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Κατάσταση"
 
@@ -2886,338 +2894,344 @@ msgstr ""
 msgid "Your JID:"
 msgstr "Το JID σας:"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Ενέργειες"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "_Προσθήκη Επαφής..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "_Προσθήκη στην Λίστα Επαφών"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Διεύθυνση:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Διαχειριστής"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Διαχειριστής"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "Για Προ_χωρημένους"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Εξουσιοδότηση"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid "_Background:"
 msgstr "Χρώμα φόντου"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "_Απαγόρευση Πρόσβασης"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "_Τοποθέτηση Σελιδοδείκτη για αυτό το Δωμάτιο"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "_Περιηγητής:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_Ακύρωση"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "_Συμπαγής Όψη   Alt+C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 #, fuzzy
 msgid "_Contents"
 msgstr "_Συνέχεια"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "Α_ντιγραφή JID/Email Διεύθυνσης"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Αντιγραφή Τοποθεσίας Δεσμού"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "_Άρνηση"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_Filter:"
 msgstr "Φιλτράρισμα:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Τέλος"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Group Chat"
 msgstr "Ομαδική Κουβέντα"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "_Υπογράμμιση λέξεων με τυπογραφικά λάθη"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_Ιστορικό"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Κεντρικός υπολογιστής:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Αγνόησε γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 #, fuzzy
 msgid "_Join New Room..."
 msgstr "Νέο Δωμάτιο"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "_Ξεφορτώσου τον"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "_Εφαρμογή Αλληλογραφίας:"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Μέλος"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "_Συνένωση λογαριασμών"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Μήνυμα"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "_Τροποποίηση"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 #, fuzzy
 msgid "_Modify Account..."
 msgstr "_Επεξεργασία Λογαριασμού..."
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Όνομα: "
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Ποτέ"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "_Ειδοποίησε με για αυτό"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_Εντάξει"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "_Ενέργειες για τους Συμμετέχοντες"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "_Συνδεδεμένοι Χρήστες"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Άνοιγμα Προγράμματος Αλληλογραφίας"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "_Άνοιγμα Δεσμού σε Περιηγητή"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "_Ιδιοκτήτης"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "_Κωδικός:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Παύση"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Αναπαραγωγέας:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "_Εμφάνισε το"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Θύρα:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Προτιμήσεις"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Παρουσία"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Δημοσιοποίηση"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Έξοδος"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "_Αφαίρεση"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "Α_φαίρεση από την Λίστα Επαφών"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "_Απάντηση"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Ανάκτηση"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "_Αποστολή"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "_Αποστολή & Κλείσιμο"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "_Αποστολή Προσωπικού Μηνύματος"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "_Αποστολή Μηνύματος Διακομιστή"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "_Αποστολή Μονού Μηνύματος"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Διακομιστής:"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "_Ορισμός Εικόνας..."
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "_Έναρξη κουβέντας"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Κατάσταση"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Εγγραφή"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Εγγραφή"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Χρήση μεσολαβητή"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "_Όνομα χρήστη:"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Φωνή"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "Κονσόλα _XML..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "λίστα μεταφορών αρχείων"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "λεπτά"
 
@@ -3242,27 +3256,41 @@ msgstr ""
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Νομός:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Μήνυμα"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Ιστορικό Κουβέντας με τον %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "Ο %s είναι τώρα %s (%s)"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Η κατάσταση είναι τώρα: %s: %s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "Η κατάσταση είναι τώρα: %s: %s"
@@ -3332,7 +3360,7 @@ msgstr "_Συνένωση λογαριασμών"
 msgid "You are already in room %s"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 #, fuzzy
 msgid "You cannot join a room while you are invisible"
 msgstr ""
@@ -3358,27 +3386,27 @@ msgstr "στον λογαριασμό %s"
 msgid "using %s account"
 msgstr "χρήση του λογαριασμού %s"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "ως %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "για τον λογαριασμό %s"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "για τον λογαριασμό %s"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "Ο %s είναι τώρα %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -3386,71 +3414,71 @@ msgid ""
 msgstr ""
 "Δεν θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από το %s."
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Επιλέξτε το κλειδί που θέλετε να εφαρμόσετε στην επαφή"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 #, fuzzy
 msgid "Re_name"
 msgstr "Μετονομασία"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "_Σύνδεση"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "_Αποσύνδεση"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 #, fuzzy
 msgid "_Change Status Message"
 msgstr "Μήνυμα για Κατάσταση %s"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Εάν ο \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Θα βλέπετε την επαφή πάντα ως αποσυνδεδεμένη"
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από την λίστα επαφών σας"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -3459,61 +3487,61 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση. Η επαφή "
 "\"%s\" θα σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Απαιτείται Κωδικός"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Απαιτείται κωδικοφράση"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Πληκτρολογήστε την GPG κωδικοφράση για το λογαριασμό %s"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Αποθήκευση της Κωδικοφράσης"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3521,7 +3549,7 @@ msgstr ""
 "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
 "ενεργοποιημένο το ιστορικό."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 #, fuzzy
 msgid "Change Status Message..."
 msgstr "Μήνυμα για Κατάσταση %s"
@@ -3533,16 +3561,17 @@ msgstr "Μήνυμα για Κατάσταση %s"
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "ως "
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "λογαριασμός: "
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 #, fuzzy
 msgid "Hide this menu"
 msgstr "Αποκρύπτει το παράθυρο"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr ""
 "Όλες οι επαφές σε αυτή την ομάδα είναι αποσυνδεδέμενες ή έχουν πρόβλημα"
@@ -3585,29 +3614,29 @@ msgstr ""
 "μήνυμα θα χαθεί."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Δεν μπορεί να από το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
@@ -3922,229 +3951,229 @@ msgid ""
 "his or her status and/or his status message."
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Τρώω"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Ταινία"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Δουλειά"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Έξω"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Είμαι έξω στην ζωή"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 #, fuzzy
 msgid "marine"
 msgstr "λεπτά"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr ""
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr ""
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 #, fuzzy
 msgid "You are banned from this room."
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr ""
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr ""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "Δεν είστε συνδεδεμένος στον διακομιστή"
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Επιθυμώ να σε προσθέσω στην λίστα επαφών μου."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Ο %s μόλις σας εξουσιοδότησε"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
 "επανασυνδεθείτε."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη."
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, fuzzy, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Σύνδεση με τον διακομιστή με %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Ελέγξτε την σύνδεση σας ή δοκιμάστε αργότερα"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Παρακαλώ ελέγξτε το συνθηματικό σας."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "Δεν δόθηκε κωδική-φράση για το OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "αόρατος"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "αποσυνδεδεμένος"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "Είμαι %s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4153,17 +4182,17 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 #, fuzzy
 msgid "Timeout"
 msgstr "Θέμα"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr ""
 
@@ -4393,6 +4422,29 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Νέο Μήνυμα ως %s"
+
+#~ msgid "Chat with"
+#~ msgstr "Κουβέντα με"
+
+#~ msgid "E-Mail"
+#~ msgstr "E-Mail"
+
+#, fuzzy
+#~ msgid "Send New Message"
+#~ msgstr "Νέο Μήνυμα"
+
+#~ msgid "as %s"
+#~ msgstr "ως %s"
+
+#~ msgid "as "
+#~ msgstr "ως "
+
 #, fuzzy
 #~ msgid "Send _New Message"
 #~ msgstr "_Νέο Μήνυμα"
diff --git a/po/es/LC_MESSAGES/gajim.po b/po/es/LC_MESSAGES/gajim.po
index 28b48457f..639a4e743 100644
--- a/po/es/LC_MESSAGES/gajim.po
+++ b/po/es/LC_MESSAGES/gajim.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-05-21 20:03+0100\n"
 "Last-Translator: Membris Khan <membriskhan@gmail.com>\n"
 "Language-Team: none\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -55,39 +55,40 @@ msgstr "Ninguno"
 msgid "Hidden"
 msgstr "Medio:"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Charla"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Grupos de charla"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "cuenta: "
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "no está en el roster"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -103,163 +104,165 @@ msgstr ""
 "\n"
 "El resalto de palabras mal escritas no será usado"
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Cada %s _minutos"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Sonido"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "título del mensaje de estado"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "texto del mensaje de estado"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "GPG no es usable en este ordenador"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "El nombre de la cuenta no puede estar vacío."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Una ID de Jabber debe estar en la forma \"usuario@nombreservidor\"."
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Entrada no válida"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "No está disponible dicha cuenta"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr "Debes crear una cuenta antes de editar tu información personal"
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sin una conexión, no puedes editar tu información personal"
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Contraseña"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Ninguna clave seleccionada"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Servidor"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Imagen"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "La imagen es demasiado grande"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -267,67 +270,67 @@ msgstr ""
 "La imagen para el emoticono debe tener un tamaño menor o igual a 24x24 "
 "píxeles"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Si la eliminas, se perderá la conexión con el servidor"
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Nuevo salón"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, asegúrate de rellenar los campos de servidor y salón o elimina "
 "este marcador."
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 #, fuzzy
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 #, fuzzy
 msgid "You must provide a username to configure this account."
 msgstr "Debes introducir un nombre para añadir una cuenta."
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Contraseña no válida"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Debes introducir una contraseña para la nueva cuenta"
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 #, fuzzy
 msgid "Account has been added successfully"
 msgstr "Marcador añadido con éxito"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
@@ -337,20 +340,20 @@ msgstr ""
 "Puedes definir opciones avanzadas usando \"Editar->Cuentas\" desde laventana "
 "principal."
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 #, fuzzy
 msgid "Your new account has been created successfully"
 msgstr "Marcador añadido con éxito"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
@@ -394,13 +397,14 @@ msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -501,27 +505,26 @@ msgstr "Petición de adición de %s"
 msgid "You can not join a group chat unless you are connected."
 msgstr "No puedes entrar a un salón de chat hasta que no estés conectado."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Entrar a un salón de chat como %s"
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Entrar a un salón de chat"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Nuevo mensaje como %s "
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "para la cuenta %s"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Nuevo mensaje"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "Iniciar conversación"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -530,130 +533,135 @@ msgstr ""
 "un mensaje de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexión, no puedes cambiar tu contraseña."
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseña."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "Las contraseñas escritas en ambos campos deben ser idénticas."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Nuevo mensaje"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Nuevo mensaje"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 #, fuzzy
 msgid "New Private Message"
 msgstr "_Enviar mensaje privado"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, fuzzy, python-format
 msgid "From %s in room %s"
 msgstr "%s está ahora %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "De %s"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "A %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Nuevo mensaje como %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Mensaje:"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, fuzzy, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Has sido invitado al sallón %s por %s"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
@@ -717,7 +725,7 @@ msgstr ""
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -738,7 +746,7 @@ msgstr "Identificador:"
 msgid "Description"
 msgstr "Descripción: %s"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -790,7 +798,7 @@ msgstr "Guardado en: %s"
 msgid "File transfer completed"
 msgstr "Transferencia de archivo finalizada"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Abrir carpeta contenedora"
 
@@ -898,7 +906,7 @@ msgstr "Remitente: "
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1206,8 +1214,8 @@ msgstr "¿Aceptas esta petición?"
 msgid "error while sending"
 msgstr "error durante el envío"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "General"
 
@@ -1235,32 +1243,32 @@ msgstr "Siempre le verás desconectado."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "No se ha podido establecer contacto con \"%s\""
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Comprueba tu conexión o reinténtalo más tarde."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "Contraseña incorrecta"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Estás actualmente conectado sin tu clave GPG"
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 #, fuzzy
 msgid "Your personal information has been published successfully."
 msgstr "Marcador añadido con éxito"
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1268,12 +1276,12 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 #, fuzzy
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
@@ -1587,7 +1595,7 @@ msgstr "Descripción: %s"
 
 #: ../src/gtkgui.glade.h:11
 #, fuzzy
-msgid "<b>Format of a Chat Line</b>"
+msgid "<b>Format of a line</b>"
 msgstr "<b>Formato del renglón</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1821,47 +1829,47 @@ msgid "Bold"
 msgstr "Negrita"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "C_onectar al inicio de Gajim"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Cancela la transferencia"
 
-#: ../src/gtkgui.glade.h:74
-msgid "Cancels the selected file transfer"
-msgstr "Cancela la transferencia de archivo seleccionada"
-
 #: ../src/gtkgui.glade.h:75
-#, fuzzy
-msgid "Cancels the selected file transfer and removes incomplete file"
+msgid "Cancels the selected file transfer"
 msgstr "Cancela la transferencia de archivo seleccionada"
 
 #: ../src/gtkgui.glade.h:76
 #, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr "Cancela la transferencia de archivo seleccionada"
+
+#: ../src/gtkgui.glade.h:77
+#, fuzzy
 msgid "Chan_ge Password"
 msgstr "Cambiar contraseña"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Cambiar _Alias"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Cambiar el _tema"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Noti_ficaciones del estado del chat"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Charlar con"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Comprobar nuevas _versiones al inicio de Gajim"
@@ -1998,106 +2006,102 @@ msgid "Display status messages of contacts in roster"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "Correo-e"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "Correo-e:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Editar grupos"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "_Editar información personal personales..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Editar grupos"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Activar"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Introdúcela de nuevo para confirmar:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Introduce nueva contraseña:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Eventos"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Cada 5 _minutos"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Segunda dirección:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Familia:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Transferencias"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Transferencias"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Administrador de archivos:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 #, fuzzy
 msgid "Font style:"
 msgstr "Fuente:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Fuente:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "De:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 #, fuzzy
 msgid "G_o"
 msgstr "Ir"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Personalización de temas de Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2106,7 +2110,7 @@ msgstr ""
 "Si está marcado, Gajim comunicará la capacidad de enviar y recibir meta-"
 "información relacionada con una conversación, como la escritura de unmensaje"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2114,7 +2118,7 @@ msgstr ""
 "Gajim mostrará automáticamente los nuevos mensajes recibidos en una ventana "
 "de charla o pestaña en una ventana de chat existente"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2122,7 +2126,7 @@ msgstr ""
 "Gajim te notificará de nuevos mensajes a través de un mensaje emergente en "
 "la esquina inferior derecha de la pantalla"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2130,7 +2134,7 @@ msgstr ""
 "Gajim notificará con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se conecte"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2138,84 +2142,84 @@ msgstr ""
 "Gajim notificará con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se desconecte"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim sólo cambiará el icono del contacto que envía el nuevo mensaje"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 #, fuzzy
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Asistente para la primera vez"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Nombre de pila:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Grupo:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "Conectar con HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Oculta la ventana"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Página web:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Nombre del host:"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "Ya tengo una cuenta y quiero usarla"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Quiero _registrar una nueva cuenta de Jabber"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Me gustaría añadirte a mi lista de contactos."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr ""
 "Si está marcado, Gajim alojará un icono en el área de notificación del "
 "sistema"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Si está marcado, Gajim entrará a este salón al inicio"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Si está marcado, Gajim recordará la contraseña para esta cuenta"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2223,7 +2227,7 @@ msgstr ""
 "Si está marcado, Gajim recordará la posición y tamaño de la ventana de "
 "contactos para futuras ejecuciones"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2231,7 +2235,7 @@ msgstr ""
 "Si está marcado, Gajim reemplazará emoticonos de texto como ':)' por su "
 "equivalente en iconos"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2239,7 +2243,7 @@ msgstr ""
 "Si está marcado, Gajim enviará paquetes de mantenimiento de actividad para "
 "prevenir que expire la conexión"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 #, fuzzy
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -2248,7 +2252,7 @@ msgstr ""
 "Si está marcado, Gajim guardará la contraseña en ~/.gajim/config con acceso "
 "de lectura para tí y el administrador únicamente"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2258,7 +2262,7 @@ msgstr ""
 "un contacto de MSN tendrá el icono de msn equivalente para su estado en "
 "línea, ausente, ocupado, etc...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2266,14 +2270,14 @@ msgstr ""
 "Si está marcado, Gajim, cuando se inicie, conectará automáticamente a Jabber "
 "usando esta cuenta."
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2281,181 +2285,181 @@ msgstr ""
 "Si tienes dos o más cuentas y está marcado, Gajim listará todos los "
 "contactos de forma mixta"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Mensaje entrante:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Info/Consulta"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 #, fuzzy
 msgid "Information about you, as stored in the server"
 msgstr "Tu información se ha guardado en el servidor como vCard"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "ID de Jabber:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "Entrar a un grupo de charla"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Dirección"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Histórico"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Gestionar cuentas"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Gestionar marcadores"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Gestionar emoticonos"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Gestionar perfiles del Proxy"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Gestionar..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Medio:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Más"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Nueva versión de Gajim disponible"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Alias:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Ninguno"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Notificar cuand un contacto: "
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "SO:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "En cada _mensaje"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Abrir página de descarga"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "Encriptación OpenPGP"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "O selecciona un mensaje predefinido:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Mensaje saliente:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "_Contraseña: "
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Contraseña: "
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 #, fuzzy
 msgid "Personal Information"
 msgstr "_Editar información personal personales..."
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Teléfono:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "Reproducir _sonidos"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Puerto: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Posición:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "Código postal:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Preferencias"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Prefijo"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Insertar la hora:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "Pr_ioridad:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2465,18 +2469,22 @@ msgstr ""
 "del servidor cuando dos o más clientes están conectados usando la misma "
 "cuenta. El cliente con mayor prioridad recibe los eventos."
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Perfil, Avatar"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Proxy"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Recientemente:"
@@ -2578,105 +2586,105 @@ msgid "Send File"
 msgstr "Enviar archivo"
 
 #: ../src/gtkgui.glade.h:246
-#, fuzzy
-msgid "Send New Message"
-msgstr "Nuevo mensaje"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Enviar mensaje"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "Enviar archivo"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 #, fuzzy
 msgid "Send _New Message..."
 msgstr "_Nuevo mensaje..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Enviar paquetes de mantenimiento de actividad"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Enviar mensaje y cerrar ventana"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr "Envía un mensaje a los usuarios conectados en este momento al servidor"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Características de los servidores"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Definir MOTD"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Definir mensaje del día"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Definir Avatar"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Define el mensaje del día"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "Mostrar contactos desconectados"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Show _Roster"
 msgstr "Sólo mostrar en la _lista de contactos"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "Consola _XML"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Sólo mostrar en la _lista de contactos"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Muestra una lista de transferencias entre tú y otro"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "Conectar"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estado"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Estado"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Iniciar conversación"
@@ -2685,7 +2693,7 @@ msgstr "Iniciar conversación"
 msgid "State:"
 msgstr "Estado:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Estado"
 
@@ -2854,338 +2862,344 @@ msgstr "Debes tener una cuenta antes de conectar a la red Jabber"
 msgid "Your JID:"
 msgstr "Tu JID"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Acciones"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "_Añadir contacto..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "_Añadir a la lista de contactos"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Dirección:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Administrar"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "_Avanzado"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Autorizar"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid "_Background:"
 msgstr "Color de fondo"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "_Banear"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "Añadir este salón a marcadores"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "Vista _compacta    Alt+C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 #, fuzzy
 msgid "_Contents"
 msgstr "_Continuar"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "_Copiar la dirección"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Copiar la dirección del enlace"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_Filter:"
 msgstr "Filtro:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Finalizar"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Group Chat"
 msgstr "Grupos de charla"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "_Resaltar errores ortográficos"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr ""
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Icono en el área de notificación"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar mensajes de contactos que no están en la lista de contactos"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "ID de _Jabber: "
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 #, fuzzy
 msgid "_Join New Room..."
 msgstr "Nuevo salón"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Miembro"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "_Combinar las cuentas"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 #, fuzzy
 msgid "_Modify Account..."
 msgstr "_Editar cuenta..."
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Nombre: "
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "_Notificarme"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificarme cuando una transferencia finalice"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "_Acciones"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "Usuarios _online"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Abrir el compositor de correo"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "_Propietario"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "C_ontraseña:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Reproductor:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "_Emerger"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Presencia"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Publicar"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "_Eliminar del Roster"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "Renombrar"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Recuperar"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "_Enviar y Cerrar"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "_Enviar mensaje privado"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "_Enviar mensaje de servidor"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "_Enviar mensaje"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "_Definir Imagen..."
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Estado"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Añadir"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Subscripción"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Usar proxy"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "_Nombre"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Voz"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "Consola _XML..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "lista de transferencias"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "minutos"
 
@@ -3210,27 +3224,41 @@ msgstr ""
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Estado:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Mensaje"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de conversaciones %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%s está ahora %s (%s)"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "El estado es ahora: %s: %s "
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %s: %s "
@@ -3300,7 +3328,7 @@ msgstr "_Combinar las cuentas"
 msgid "You are already in room %s"
 msgstr "Ya estás en el salón %s"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 #, fuzzy
 msgid "You cannot join a room while you are invisible"
 msgstr "No puedes entrar a un salón de chat hasta que no estés conectado."
@@ -3324,97 +3352,97 @@ msgstr "a la cuenta %s"
 msgid "using %s account"
 msgstr "usando la cuenta %s"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "como %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "para la cuenta %s"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "para la cuenta %s"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s está ahora %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr "Ya no podrás enviar y recibir mensajes a contactos desde %s"
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 #, fuzzy
 msgid "Re_name"
 msgstr "Renombrar"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "_Conectar"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 #, fuzzy
 msgid "_Change Status Message"
 msgstr "Mensaje de estado %s"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "La autorización ha sido enviada"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Si \"%s\" acepta esta petición podrás saber su estado."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "La autorización ha sido enviada"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Siempre le verás desconectado."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -3423,59 +3451,59 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. El "
 "contacto\"%s\" siempre te verá descnectado."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Contraseña requerida"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Introduce contraseña GPG para la cuenta %s"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Guardar contraseña"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Debes crear una cuenta antes de poder conversar con otros contactos."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3483,7 +3511,7 @@ msgstr ""
 "Los mensajes sólo estarán disponibles para lectura posterior si tienes el "
 "histórico activado"
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 #, fuzzy
 msgid "Change Status Message..."
 msgstr "Mensaje de estado %s"
@@ -3495,16 +3523,17 @@ msgstr "Mensaje de estado %s"
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "con "
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "cuenta: "
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 #, fuzzy
 msgid "Hide this menu"
 msgstr "Oculta la ventana"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr "Todos los contactos de este grupo están desconectados o tienen errores"
 
@@ -3545,29 +3574,29 @@ msgstr ""
 "perderá."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "No hay disponible una conexión"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Tu mensaje no será enviado mientras no estés conectado."
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Falló el envío del mensaje privado"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Ya no estás en el salón \"%s\" o \"%s\" ya no existe."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Encriptación activada"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Encriptación desactivada"
 
@@ -3879,229 +3908,229 @@ msgid ""
 "his or her status and/or his status message."
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Comiendo"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Estoy comiendo, déjame un mensaje."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Película"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Trabajando"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Fuera"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Estoy disfrutando la vida"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 #, fuzzy
 msgid "marine"
 msgstr "minutos"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr ""
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "No se pudo entrar al salón"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr ""
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 #, fuzzy
 msgid "You are banned from this room."
 msgstr "Ya estás en el salón %s"
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr ""
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr ""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "No estás conectado al servidor"
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "%s te ha desagregado"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Petición de adición de %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s te ha desagregado"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Se ha perdido la conexión de la cuenta \"%s\""
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Para continuar enviando y reciviendo mensajes, necesitarás volver a conectar."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "No se puede conectar a %s"
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, fuzzy, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Conectado al servidor con %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Comprueba tu conexión o inténtalo más tarde"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falló la autentificación con \"%s\""
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr ""
 "Por favor, comprueba que tu nombre de usuario y contraseña sean correctos."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "No se ha facilitado la clave OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Se conectará a %s sin OpenPGP"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "Invisible"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "Desconectado"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "Estoy %s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Este mensaje está encriptado]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4110,17 +4139,17 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 #, fuzzy
 msgid "Timeout"
 msgstr "Tema"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr ""
 
@@ -4350,6 +4379,29 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "error: no se puede abrir %s para leer"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Nuevo mensaje como %s "
+
+#~ msgid "Chat with"
+#~ msgstr "Charlar con"
+
+#~ msgid "E-Mail"
+#~ msgstr "Correo-e"
+
+#, fuzzy
+#~ msgid "Send New Message"
+#~ msgstr "Nuevo mensaje"
+
+#~ msgid "as %s"
+#~ msgstr "como %s"
+
+#~ msgid "as "
+#~ msgstr "con "
+
 #, fuzzy
 #~ msgid "Send _New Message"
 #~ msgstr "_Nuevo mensaje"
diff --git a/po/eu/LC_MESSAGES/gajim.po b/po/eu/LC_MESSAGES/gajim.po
index d198afbe7..4e567a1f9 100644
--- a/po/eu/LC_MESSAGES/gajim.po
+++ b/po/eu/LC_MESSAGES/gajim.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-11-20 16:57+0100\n"
 "Last-Translator: Urtzi Alfaro <urtzi@altza.net>\n"
 "Language-Team: Basque <urtzi@altza.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "GTK+ jabber bezeroa"
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -51,39 +51,40 @@ msgstr "(Ezer ez)"
 msgid "Hidden"
 msgstr "Ikusezin"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Txat"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Txat taldea"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "kontua: "
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "Zerrendan ez dago"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Aldatu %s -ra"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -99,245 +100,247 @@ msgstr ""
 "\n"
 "Highlighting misspelled words feature will not be used"
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "%s _minuturo"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Aktibatua"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Soinua"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "egoera mezuaren izenburua"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "egoera mezuaren testua"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Aukeratu soinua"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Wav soinuak"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP ezin da ordenagailu honetan erabili"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Zerbitzarira konektatu zaude dagoeneko"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Kontu izena ezin da hustu."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Kontuko izenak ezin du espaziorik izan."
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID baliogabea"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "\"izena@zerbitzaria\" Jabber ID-a horrela izan behar da."
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Horrelako konturik ez erabilgarri"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr "Kontu bat sortu behar duzu informazio petsonala editatu baino lehen."
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Konektatzen ez bazara, ezin duzu zure informazio pertsonala aldatu."
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Kode sekretua lortzeko huts egitea"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Pasa-esaldia"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Aukeratu zure OpenPGP kodea"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Ez da koderik aukeratu"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Izena"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Zerbitzaria"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Transportea"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "Editatu %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "%s -ra erregistratua"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Testua"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Irudia"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "Irudia handiegia da"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
 msgstr ""
 "24x24 tamainako berdina edo gutxiagoko emoticon-ak jarri daitezke bakarrik."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Aukeratu irudia"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Gela berria"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Talde agenda honek datu-banku baliogabea du"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Mesedez ziurtatu ezazu zerbitzariaren eta gelaren informazioa betetzeaz edo "
 "talde agenda hau ezabatzeaz"
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 msgid "Invalid username"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 msgid "You must provide a username to configure this account."
 msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Pasahitz baliogabea"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Kontu berrirako pasahitz bat sartu behar duzu."
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
 msgstr "Kontuko aukera aurreratuak ezarri ditzakezu Aurreratu botoila sakatuz."
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 msgid "Your new account has been created successfully"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
 
@@ -381,13 +384,14 @@ msgid "Yesterday"
 msgstr "Atzo"
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr "%i egun lehenago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
@@ -482,27 +486,26 @@ msgstr "Harpidetza baimena %s kontutik"
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Txat taldera sartu  %s bezala"
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Txat taldean sartu"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Mezu berria %s bezala"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "%s konturako"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Mezu berri bat"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "_Txat-a hasi"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -511,129 +514,134 @@ msgstr ""
 "kontaktu ID-a:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatua zauden."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Pasahitza sartu behar duzu."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "Bi lekuetan pasahitza berdina izan behar du."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Kontatua konektatuta"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Mezu berri bat"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Mezu berri bat"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 msgid "New Private Message"
 msgstr "Mezu pribatu berri bat"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, python-format
 msgid "From %s in room %s"
 msgstr "%s gelan %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "%s -etik"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Fitxeroa transferitzeko baimena"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Fitxero transferitze errorea"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Fitxero transferitzea egina"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Fitxero transferentzia gelditua"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "%s -entzat"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Mezu bakarra %s bezala"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Mezu bakarra"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Bidali %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "Jasoa %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konsola %s-rena"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr " XML Konsola"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "%(room_jid)s gelara gonbidatua izan zara %(contact_jid)s -rengatik"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
@@ -696,7 +704,7 @@ msgstr "Zerbitzari hoenk ez du begiratzeko menurik."
 msgid "Re_gister"
 msgstr "Erre_gistratu"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "_Editatu"
 
@@ -715,7 +723,7 @@ msgstr "Erabiltzaileak"
 msgid "Description"
 msgstr "Deskribapena"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Sartu"
 
@@ -766,7 +774,7 @@ msgstr "%s gordea"
 msgid "File transfer completed"
 msgstr "Fitxero transferentzia osatua"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Ireki fitxeroaren edukia"
 
@@ -872,7 +880,7 @@ msgstr "Bidaltzailea: "
 msgid "Pause"
 msgstr "Etena"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Jarraitu"
 
@@ -1174,8 +1182,8 @@ msgstr "Baimen hau onartzen al duzu?"
 msgid "error while sending"
 msgstr "errore bat sortu da bidaltzen zen bitartean"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Generala"
 
@@ -1202,31 +1210,31 @@ msgstr "Beti deskonektatua ikusiko duzu."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" ezin izan da kontaktuan jarri"
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "Zure pasa-esaldia ez da egokia"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Zure OpenPGP koderik gabe konektatu zara."
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr "vCard publikazioa egina"
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "Your personal information has been published successfully."
 msgstr "Zure informazio pertsonala egoki publikatua izan da."
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr "cCard publikazioak failatu du"
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1236,12 +1244,12 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 #, fuzzy
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak gorde"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management support not available (missing gnome.ui module)"
 
@@ -1575,7 +1583,8 @@ msgid "<b>Description</b>"
 msgstr "<b>Deskribapena</b>"
 
 #: ../src/gtkgui.glade.h:11
-msgid "<b>Format of a Chat Line</b>"
+#, fuzzy
+msgid "<b>Format of a line</b>"
 msgstr "<b>Txateko marraren formatua</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1804,47 +1813,47 @@ msgid "Bold"
 msgstr "Bold"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "K_onektatu Gajim irikitzean"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Fitxategi transferentzia kantzelatu"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Kantzelatu aukeratutako fitxategi transferentzia"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr ""
 "Kantzelatu aukeratutako fitxategi transferentzia eta borratu bukatu gabeko "
 "fitxeroa "
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Al_datu pasahitza"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Aldatu pasahitza"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Aldatu _Nick-a"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Aldatu _Gaia"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Txateko egoeraren no_tifikazioa:"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Txateatu honekin"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Begiratu bertsio _berria Gajim abiaraztean"
@@ -1978,104 +1987,100 @@ msgid "Display status messages of contacts in roster"
 msgstr "Erakuts arazi egoera mezua kontaktuena zerrendan"
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Taldeak editatu"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "Informazio pertsonala editatu..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Editatu _Taldeak"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Aktibatu"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Sartu berriro konfirmatzeko:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Sartu pasahitz berria:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Gertaerak"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "5 _minuturo"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Helbide gehigarria:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Familia:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Fitxero transferentzia"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "Fitxero _Transferentzia"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Fitxero administratzaile:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtroa:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Iturburuaren estiloa:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Tipoa:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formatua: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Frequently Asked Questions (online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Norena:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "J_oan"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Gajim-en gaien kustomizatazailea"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2083,7 +2088,7 @@ msgstr ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2091,7 +2096,7 @@ msgstr ""
 "Gajim-ek automatikoki jasotako mezu berriak leiho berri batean edo jadanik "
 "dagoen leiho batean irakutsiko ditu"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2099,13 +2104,13 @@ msgstr ""
 "Gajim-ek mezu berriaz notifikatuko dizu popup bidez pantailaren beheko "
 "eskubiko aldean"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
 msgstr "Sartu berri diren kontaktuez notifikatuko dizu Gajim-ek popup bidez"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2113,62 +2118,62 @@ msgstr ""
 "Deskonektatu diren kontaktuez Gajim-ek notifikatuko dizu popup bidez "
 "pantailako beheko eskubiko aldean"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajim-ek bakarrik kontaktuaren ikonoa mezu berri bat dagoenean aldatzen du"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontu sortzailearen wizard-a"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Eman:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Taldea:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "HTTP konektatua"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr "Online laguntza"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Leihoa ezkutatu"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Web pertsonala:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Hostname: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "Dagoeneko badut kontu bat erabiltzeko"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Kontu berri bat _erregistratu nahi dut"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Nire kontaktu listara nahi zaitut sartu."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "If checked, Gajim will also have a trayicon"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
@@ -2176,7 +2181,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek abaterea azalaraziko du, bat ezarria badago, "
 "denentzat ezarriko da."
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -2184,15 +2189,15 @@ msgstr ""
 "Hautatua badago, Gajim-ek egoera mezua erakutsaraziko du, ez badago hutsik, "
 "izenen azpian zerrendan azalduko da kontaktu guztietan."
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Hautatua badago, Gajim-ek kontu honen pasahitza gogoraraziko du"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2200,7 +2205,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek abiarazten duzun hurrengoan zerrenda gogoraraziko "
 "du eta txateko leihoaren posizioa eta tamaina pantailan ere"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2208,7 +2213,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek  ´:)´ ascii hauek bere irudi grafikoaz eraldatuko "
 "ditu"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2216,7 +2221,7 @@ msgstr ""
 "hautatua badago, Gajim-ek keep-alive paketeak bidaliko ditu deskonexioa "
 "gerta ez dadin."
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2224,7 +2229,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek pasahitzak  ~/.gajim/config gordeko ditu "
 "irakurtzeko baimena zuk bakarrik izanik"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2234,7 +2239,7 @@ msgstr ""
 "ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak "
 "jarriko dira.)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2242,7 +2247,7 @@ msgstr ""
 "Hautatua badago, abiaraztean, automatikoki jabberrera konektatuko da kontu "
 "hau erabiliz"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 "
@@ -2252,7 +2257,7 @@ msgstr ""
 "bottom of the roster window) will change the status of this account "
 "accordingly"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2260,179 +2265,179 @@ msgstr ""
 "Bi kontu edo gehiago badituzu eta aukera hau hautatua badago, Gajim-ek "
 "kontaktu guztiak kontu bat izango bazenu bezala jarriko lituzke listan."
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Sarrerako mezua:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Informatu/Galdetu"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 msgid "Information about you, as stored in the server"
 msgstr "Zuri buzuzko informazioa zerbitzarian gordea dago"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr "Gonbidapena jasoa"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Italic"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "Txat taldean _Sartu"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Kokapena"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Historialaren log-a"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Kontuak moldatu"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Talde agenda moldatu"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Emoticonoak moldatu"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Proxy profila moldatu"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Moldatu..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Erdia:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "Mo_deratzailea"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Gehiago"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Izena:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Gajim-en bertsio berri bat eskuragarri"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Nick-a:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Inor ez"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Notifikatu kontaktuek hau egitean: "
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "Mezu _guztietan"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Deskarga orria ireki"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Ireki..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "Ireki OpenPGP enkriptazioa"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "Edo ezarritako egoera mezu bat aukeratu:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "kanpoan nagoeneko mezua:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "Pasa_hitza:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 msgid "Personal Information"
 msgstr "Informazio pertsonala "
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Telefono zenbakia:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "Soinuak _entzun"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Portua: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Tokia:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "Posta kodea:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Preferentziak"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Aurreizkia:"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Imprimatu ordua:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "Priori_tatea:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2442,18 +2447,22 @@ msgstr ""
 "berdinarekin zeinek jaso behar duen informazioa determinatzen du; Prioritate "
 "handiena duen bezeroak jasotzen ditu mezuak."
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Profila, Abatareak"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Protokoloa:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Proxy:"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Berriki:"
@@ -2551,102 +2560,103 @@ msgid "Send File"
 msgstr "Bidali fitxeroa"
 
 #: ../src/gtkgui.glade.h:246
-msgid "Send New Message"
-msgstr "Mezu berri bat bidali"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Bidali mezu _Bat"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "Bidali _fitxeroa"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 msgid "Send _New Message..."
 msgstr "Mezu _berri bat bidali ..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Bidali keep-alive paketeak"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Bidali mezua"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Bidali mezua eta itxi leihoa"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr ""
 "Bidali mezu bat zerbitzari honetara orain konektatuta dauden kontaktuei"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Zerbitzariaren ezaugarriak:"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Ezarri MOTD"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Ezarri eguneko mezua"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Ezarri _Abatereak"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr "Ezarri abatere bat konektatzean"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Ezarri eguneko mezua"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr "Erakutsi pendiente dauden _gertaerak"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "Ikusi _deskonektatutako kontaktuak"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 msgid "Show _Roster"
 msgstr "Ikusi _zerrenda"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 msgid "Show _XML Console"
 msgstr "_XML konsola ikusarazi"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Ikusi _zerrendan bakarrik"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Erakutsi zu eta beste baten arteko fitxero transferentzia"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "_Konektatua"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "_Deskonektatua"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Sailkatu kontaktuak egoeraren bidez"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Egoera"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Txat elkarrizketa _hasi"
@@ -2655,7 +2665,7 @@ msgstr "Txat elkarrizketa _hasi"
 msgid "State:"
 msgstr "Egoera:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Egoera"
 
@@ -2821,333 +2831,339 @@ msgstr ""
 msgid "Your JID:"
 msgstr "Zure JID-a:"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Aukerak"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "_Kontaktua gehitu..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "_Zerrendara sartu"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Helbidea:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Administratzailea"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "_Aurreratua"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Autorizatu"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Background:"
 msgstr "A_tzealdeko kolorea:"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "_Debekatu"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "_Talde agendan sartu gela hau"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "_Bilatu:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_kantzelatu"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "_Bista trikoa        Alt+C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Contents"
 msgstr "_Edukiak"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiatu JID/Email-a"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Link kokapena kopiatu"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "_Ukatu"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr "_Zerbitzuak aurkitu"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr "_Zerbitzuak aurkitu..."
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Filter:"
 msgstr "_Filtroa:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Bukatu"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Group Chat"
 msgstr "Txat _taldea"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_Historiala"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Host-a"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "_IG"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Ikurra notifikazio lekuan"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Zerrendan ez dauden kontaktuen getaerak baztertu"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Join New Room..."
 msgstr "Gela berrian _sartu..."
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "_Kick"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 #, fuzzy
 msgid "_Log status changes of contacts"
 msgstr "Erakuts arazi egoera mezua kontaktuena zerrendan"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "_Email bezeroa"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Partaidea"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "_Batu kontuak"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Mezua"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "_Eraldatu"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Modify Account..."
 msgstr "_kontua editatu"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Izena "
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Inoiz"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "_Notifikatu niri horri buruz"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notifikatu fitxeroa transferitu denean"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "_Bete beharreko aukerak"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "_Konektatutako jendea"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Ireki email konposatzailea"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "Web-ean _ireki link-a"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "_Jabea"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Eten"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Entzun"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "_Pop it up"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Portua:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Preferentziak"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Presentzia"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Argitaratu"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Atera"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "_Borratu"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "_Zerrendatik ezabatua"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "_Berrrizenpetu"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "_Erantzun"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Berridatzi"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "_Bidali"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "_Bidali eta itxi"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "_Bidali mezu pribatu bat"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "_Bidali zerbitzariari mezua"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "_Bidali mezu bakarra"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Zerbitzaria"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "_Ezarri irudia"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "_Txat-a hasi"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Egoera"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Harpidetza"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Proxy erabili"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "_Izena"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Ahotsa"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "_XML konsola..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "fitxeroen transferentziaren lista"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "minutu"
 
@@ -3173,27 +3189,41 @@ msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "ezin izan da  %s-ri idatzi. Sesio administratzailea euskarria ez dago lanean."
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Egoera:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Mezua"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Elkarrizketa historiala %s-rekin"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%s orain %s da:(%s)"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Egoera orain da: %s: %s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "Egoera orain da: %s: %s"
@@ -3263,7 +3293,7 @@ msgstr "Batu kontuak"
 msgid "You are already in room %s"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 msgid "You cannot join a room while you are invisible"
 msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
 
@@ -3285,27 +3315,27 @@ msgstr "%s kontura"
 msgid "using %s account"
 msgstr "%s kontua erabiliz"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "%s kontua bezala"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "%s konturako"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "%s konturako"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s orain %s da:(%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3313,68 +3343,68 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP kode bat izendatu"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Kode bat aukeratu kontuari ezartzeko"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Nire zerrendara nahi nizuke sartu"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 msgid "Re_name"
 msgstr "_Berrizenpetu"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "_Log aktibatua"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "Log_desaktibatua"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "\"%s\" harpidetza onartzen baduzu bere egoera ikus ahal izango duzu."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Autorizazioa bidalia izan da"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Beti deskonektatua ikusiko duzu."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3382,41 +3412,41 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak "
 "deskonektatua ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr "Kontaktu hau borratu ondoren nire egoera jakitea nahi dut."
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Pasa-esaldia behar da"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "gorde pasa-esaldia"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3424,26 +3454,26 @@ msgstr ""
 "Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
 "honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr "Mezuak gero irakurri ahalko dira historiala aktibatua baduzu."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 msgid "Change Status Message..."
 msgstr "Egoera Mezua Aldatu..."
 
@@ -3453,15 +3483,16 @@ msgstr "_Egoera Mezua Aldatu..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "bezala "
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "kontua: "
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 msgid "Hide this menu"
 msgstr "Ezkutatu menu hau"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr "Talde honetako guztiak deskonektatuta daude edo erroreak dituzte"
 
@@ -3502,29 +3533,29 @@ msgstr ""
 "da."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "Konexioa ez dago erabilgarri"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Zure mezua ezin da bidali konektatu harte"
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "ez zaude gela honetan \"%s\" edo \"%s\" joan da."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Enkriptazioa aktibatuta"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
@@ -3859,59 +3890,59 @@ msgstr ""
 "Ezeztua bada, ez duzu egoera lerroa ikusiko kontaktu batek bere egoera "
 "aldaketa egiten duenean edota bere egoera mezua."
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Lotan"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Laster etorriko naiz"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "Minutu batzuk barru berriro hemen."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Jaten"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Jaten ari naiz, utzi mezu bat beraz."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Filmea"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Fime bat ikustean ari naiz."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Lanean"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Lanean ari naiz."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Telefonoan nago."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "kanpoan"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Kanpoan naiz bizitza disfrutatzen"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -3919,7 +3950,7 @@ msgstr ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -3928,61 +3959,61 @@ msgstr ""
 "account only if notify_on_all_muc_messages is True)"
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr "berdea"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr "gizakia"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr "plain"
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Ezin da gela honetara sartu"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr "Pasahitza behar da gela onetan sartzeko."
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 msgid "You are banned from this room."
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr "Honako gela hau ez du esistitzen."
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr "Gela sortzea mugatua dago."
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr "Erregistratutako nick-a erabilia izan behar da."
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 msgid "You are not in the members list."
 msgstr "Ez zaude kideen listan."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -3990,116 +4021,116 @@ msgstr ""
 "Zuk aukeratutako nick-a erregistratuta dago jadanik.\n"
 "Mesedez ezarri beste nick bat."
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "%s -ra harpidetuak gaude orain"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Harpidetza kentzekoa eskaera %s -tik"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s -ren harpidetzatik kenduta gaude"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Mezuak jasotzen eta bidaltzen jarraitzeko berriro konektatu beharko zara."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "%s zerbitzarira konektatu: %s %s -ekin"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Begira ezazu zure konexioa edo saiatu berriro"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" -rekin autentifikazioak huts egin du"
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Mesedez begira ezazu zure izena eta pasahitza xehetasun handiz."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP pasa-esaldia ez da eman"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "%s konektatu behar zara OpenPGP-rik gabe."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "ikusezin"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "deskonektatua"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "%s naiz"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
 "%s"
 msgstr "Gaia:%s%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Erregistroaren informazioa transporteetarako %s ez da denboran iritsi"
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 msgid "Timeout"
 msgstr "Denbora bukatua"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr "Protokolo errore bat gertatu da:"
 
@@ -4322,6 +4353,28 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "errorea: ezin da %s ireki irakurtzeko"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Mezu berria %s bezala"
+
+#~ msgid "Chat with"
+#~ msgstr "Txateatu honekin"
+
+#~ msgid "E-Mail"
+#~ msgstr "E-Mail"
+
+#~ msgid "Send New Message"
+#~ msgstr "Mezu berri bat bidali"
+
+#~ msgid "as %s"
+#~ msgstr "%s kontua bezala"
+
+#~ msgid "as "
+#~ msgstr "bezala "
+
 #~ msgid "Send _New Message"
 #~ msgstr "Mezu _berri bat bidali"
 
diff --git a/po/fr/LC_MESSAGES/gajim.po b/po/fr/LC_MESSAGES/gajim.po
index d55066102..997d0fcdb 100644
--- a/po/fr/LC_MESSAGES/gajim.po
+++ b/po/fr/LC_MESSAGES/gajim.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-11-27 23:05+0100\n"
 "Last-Translator: Yann Le Boulanger <asterix@lagaule.org>\n"
 "Language-Team: none\n"
@@ -24,9 +24,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Un client Jabber en GTK+"
 
-#: ../gajim.desktop.in.h:2
-#: ../src/gtkgui.glade.h:137
-#: ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -56,322 +54,311 @@ msgstr "(Aucune)"
 msgid "Hidden"
 msgstr "Éléments masqués"
 
-#: ../src/chat.py:180
-#: ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Discussion"
 
-#: ../src/chat.py:182
-#: ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Groupes de Discussion"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "compte : "
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424
-#: ../src/conversation_textview.py:375
-#: ../src/dialogs.py:112
-#: ../src/dialogs.py:331
-#: ../src/dialogs.py:369
-#: ../src/dialogs.py:928
-#: ../src/dialogs.py:929
-#: ../src/gajim.py:550
-#: ../src/gajim.py:551
-#: ../src/roster_window.py:970
-#: ../src/roster_window.py:1241
-#: ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661
-#: ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113
-#: ../src/roster_window.py:2356
-#: ../src/roster_window.py:2358
-#: ../src/roster_window.py:2427
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
+#: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
+#: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "Absent de la liste"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Basculer vers %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
-"If that is not your language for which you want to highlight misspelled words, then please set your $LANG as appropriate. Eg. for French do export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n"
+"If that is not your language for which you want to highlight misspelled "
+"words, then please set your $LANG as appropriate. Eg. for French do export "
+"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
+"global in /etc/profile.\n"
 "\n"
 "Highlighting misspelled words feature will not be used"
 msgstr ""
-"Si ce n'est pas la langue pour laquelle vous souhaitez souligner les fautes, configurer votre variable $LANG comme vous le souhaitez. Ajoutez export LANG=fr_FR ou export LANG=fr_FR.UTF-8 à votre fichier ~/.bash_profile ou plus globalement dans /etc/profile.\n"
+"Si ce n'est pas la langue pour laquelle vous souhaitez souligner les fautes, "
+"configurer votre variable $LANG comme vous le souhaitez. Ajoutez export "
+"LANG=fr_FR ou export LANG=fr_FR.UTF-8 à votre fichier ~/.bash_profile ou "
+"plus globalement dans /etc/profile.\n"
 "\n"
 "La vérification orthographique ne sera pas utilisée"
 
-#: ../src/config.py:188
-#: ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Toutes les %s _minutes"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Actif"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Son"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "titre du message d'état"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "texte du message d'état :"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Choisissez un son"
 
-#: ../src/config.py:999
-#: ../src/config.py:2077
-#: ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "Pour changer le nom du compte, vous devez être déconnecté."
 
-#: ../src/config.py:1193
-#: ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Nom de compte invalide"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Le nom du compte ne peut pas être vide."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
 
-#: ../src/config.py:1206
-#: ../src/config.py:1212
-#: ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un Identifiant Jabber doit être de la forme \"user@servername\"."
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Compte non disponible"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr "Vous devez d'abord créer votre compte avant d'éditer vos informations."
 
-#: ../src/config.py:1377
-#: ../src/dialogs.py:637
-#: ../src/dialogs.py:757
-#: ../src/disco.py:414
-#: ../src/vcard.py:394
-#: ../src/vcard.py:422
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
+#: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Il y a eut un problème durant la récupération de vos clés OpenPGP secrètes."
+msgstr ""
+"Il y a eut un problème durant la récupération de vos clés OpenPGP secrètes."
 
-#: ../src/config.py:1413
-#: ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Mot de passe"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
 
-#: ../src/config.py:1422
-#: ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Pas de clé sélectionnée"
 
 #. Name column
-#: ../src/config.py:1641
-#: ../src/disco.py:667
-#: ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Serveur"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887
-#: ../src/dialogs.py:112
-#: ../src/dialogs.py:293
-#: ../src/dialogs.py:331
-#: ../src/disco.py:114
-#: ../src/disco.py:115
-#: ../src/disco.py:1150
-#: ../src/roster_window.py:145
-#: ../src/roster_window.py:163
-#: ../src/roster_window.py:185
-#: ../src/roster_window.py:2352
-#: ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427
-#: ../src/systray.py:240
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
+#: ../src/disco.py:1150 ../src/roster_window.py:145
+#: ../src/roster_window.py:163 ../src/roster_window.py:185
+#: ../src/roster_window.py:2352 ../src/roster_window.py:2354
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Transports"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Image"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: ../src/config.py:2005
-msgid "Image for emoticon has to be less than or equal to 24 pixels in width and 24 in height."
-msgstr "L'image pour l'émoticône doit être inférieure ou égale à 24 points en largeur et 24 points en hauteur."
+#: ../src/config.py:2006
+msgid ""
+"Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
+"in height."
+msgstr ""
+"L'image pour l'émoticône doit être inférieure ou égale à 24 points en "
+"largeur et 24 points en hauteur."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: ../src/config.py:2082
-#: ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Images"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Nouveau Salon"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-pages contient des données invalides"
 
-#: ../src/config.py:2344
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-pages"
+#: ../src/config.py:2345
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
+msgstr ""
+"Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-"
+"pages"
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 msgid "Invalid username"
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 msgid "You must provide a username to configure this account."
 msgstr "Vous devez entrer un nom d'utilisateur pour configurer ce compte."
 
-#: ../src/config.py:2570
-#: ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Vous devez entrer un mot de passe pour enregistrer un nouveau compte."
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
 
-#: ../src/config.py:2597
-#: ../src/config.py:2628
-msgid "You can set advanced account options by pressing Advanced button, or later by clicking in Accounts menuitem under Edit menu from the main window."
-msgstr "Vous pouvez configurer les options avancées en cliquant sur le bouton Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la fenêtre principale."
+#: ../src/config.py:2598 ../src/config.py:2629
+msgid ""
+"You can set advanced account options by pressing Advanced button, or later "
+"by clicking in Accounts menuitem under Edit menu from the main window."
+msgstr ""
+"Vous pouvez configurer les options avancées en cliquant sur le bouton "
+"Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
+"fenêtre principale."
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 msgid "Your new account has been created successfully"
 msgstr "Votre nouveau compte a été créé avec succès"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
 #: ../src/conversation_textview.py:182
-msgid "Text below this line is what has been said since the last time you paid attention to this group chat"
-msgstr "Le texte sous cette règle correspond à ce qui a été dit depuis la dernière fois que vous avez consulté ce groupe de discussion"
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
+msgstr ""
+"Le texte sous cette règle correspond à ce qui a été dit depuis la dernière "
+"fois que vous avez consulté ce groupe de discussion"
 
 #: ../src/conversation_textview.py:241
 #, python-format
@@ -390,7 +377,8 @@ msgstr "Chercher dans le _Dictionnaire"
 #: ../src/conversation_textview.py:272
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
-msgstr "Il manque un \"%s\" dans l'URL du dictionnaire et ce n'est pas WIKTIONARY"
+msgstr ""
+"Il manque un \"%s\" dans l'URL du dictionnaire et ce n'est pas WIKTIONARY"
 
 #. we must have %s in the url
 #: ../src/conversation_textview.py:283
@@ -407,13 +395,14 @@ msgid "Yesterday"
 msgstr "Hier"
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr "Il y a %i jours"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
@@ -507,32 +496,30 @@ msgstr "Requête d'inscription de la part de %s"
 
 #: ../src/dialogs.py:638
 msgid "You can not join a group chat unless you are connected."
-msgstr "Vous ne pouvez joindre un groupe de discussion tant que vous n'êtes pas connecté."
+msgstr ""
+"Vous ne pouvez joindre un groupe de discussion tant que vous n'êtes pas "
+"connecté."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Rejoindre un groupe de discussion en tant que %s"
 
-#: ../src/dialogs.py:653
-#: ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Rejoindre un groupe de discussion"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Nouveau message en tant que %s"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "pour le compte %s"
 
-#. chat message
-#: ../src/dialogs.py:737
-#: ../src/dialogs.py:826
-#: ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Nouveau message"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "_Commencer une discussion"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -541,153 +528,134 @@ msgstr ""
 "envoyer un message"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746
-#: ../src/dialogs.py:1088
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: ../src/dialogs.py:747
-#: ../src/dialogs.py:1089
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connectés avec \"%s\"."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Vous devez être connecté pour changer votre mot de passe."
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Vous devez entrez un mot de passe."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816
-#: ../src/gajim.py:379
-#: ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
-#: ../src/dialogs.py:821
-#: ../src/gajim.py:398
-#: ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
-#: ../src/dialogs.py:826
-#: ../src/gajim.py:478
-#: ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Nouveau message"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Nouveau message simple"
 
-#: ../src/dialogs.py:827
-#: ../src/dialogs.py:831
-#: ../src/gajim.py:433
-#: ../src/notify.py:96
-#: ../src/notify.py:99
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
+#: ../src/notify.py:96 ../src/notify.py:99
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, python-format
 msgid "From %s in room %s"
 msgstr "De la part de %s dans le salon %s"
 
-#: ../src/dialogs.py:836
-#: ../src/dialogs.py:842
-#: ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "De %s"
 
-#: ../src/dialogs.py:838
-#: ../src/gajim.py:883
-#: ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Requête de transfert de fichier"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844
-#: ../src/gajim.py:808
-#: ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de Fichier"
 
-#: ../src/dialogs.py:849
-#: ../src/gajim.py:914
-#: ../src/notify.py:115
-#: ../src/notify.py:125
-#: ../src/notify.py:140
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Transfert de Fichier Terminé"
 
-#: ../src/dialogs.py:849
-#: ../src/gajim.py:917
-#: ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Transfert de Fichier Arrêté"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "À %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Message simple en tant que %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Message simple"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML pour %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Vous avez été invité dans le salon %(room_jid)s par %(contact_jid)s"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
@@ -704,8 +672,7 @@ msgstr "Conférence"
 msgid "Without a connection, you can not browse available services"
 msgstr "Vous devez être connecté pour voir les services"
 
-#: ../src/disco.py:489
-#: ../src/disco.py:491
+#: ../src/disco.py:489 ../src/disco.py:491
 msgid "Service Discovery"
 msgstr "Gestion des Services"
 
@@ -714,11 +681,14 @@ msgid "The service could not be found"
 msgstr "Le service n'a pu être trouvé"
 
 #: ../src/disco.py:570
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
-msgstr "Il n'y a aucun service à l'adresse indiquée, ou bien il ne répond pas. Veuillez vérifier l'adresse et réessayer."
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Il n'y a aucun service à l'adresse indiquée, ou bien il ne répond pas. "
+"Veuillez vérifier l'adresse et réessayer."
 
-#: ../src/disco.py:574
-#: ../src/disco.py:857
+#: ../src/disco.py:574 ../src/disco.py:857
 msgid "The service is not browsable"
 msgstr "Le service ne peut pas être parcouru"
 
@@ -744,14 +714,11 @@ msgstr "_Parcourir"
 msgid "This service does not contain any items to browse."
 msgstr "Ce service ne contient aucun élément à parcourir."
 
-#: ../src/disco.py:1078
-#: ../src/disco.py:1155
+#: ../src/disco.py:1078 ../src/disco.py:1155
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: ../src/disco.py:1153
-#: ../src/gtkgui.glade.h:333
-#: ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "_Éditer"
 
@@ -770,8 +737,7 @@ msgstr "Utilisateurs"
 msgid "Description"
 msgstr "Description"
 
-#: ../src/disco.py:1406
-#: ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "Re_joindre"
 
@@ -787,33 +753,28 @@ msgstr "Moment"
 msgid "Progress"
 msgstr "Progression"
 
-#: ../src/filetransfers_window.py:168
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Nom du Fichier : %s"
 
-#: ../src/filetransfers_window.py:170
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:304
 #, python-format
 msgid "Size: %s"
 msgstr "Taille : %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:179
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:189
 msgid "You"
 msgstr "Vous"
 
-#: ../src/filetransfers_window.py:180
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
 #, python-format
 msgid "Sender: %s"
 msgstr "Expéditeur : %s"
 
-#: ../src/filetransfers_window.py:181
-#: ../src/filetransfers_window.py:535
+#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:535
 #: ../src/tooltips.py:484
 msgid "Recipient: "
 msgstr "Destinataire : "
@@ -827,18 +788,15 @@ msgstr "sauvé dans : %s"
 msgid "File transfer completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/filetransfers_window.py:197
-#: ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Ouvrir le répertoire de destination"
 
-#: ../src/filetransfers_window.py:215
-#: ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
 msgid "File transfer canceled"
 msgstr "Transfert de fichier annulé"
 
-#: ../src/filetransfers_window.py:215
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
 msgid "Connection with peer cannot be established."
 msgstr "La connexion avec le contact ne peut être établi."
 
@@ -910,8 +868,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgid "(%s/s)"
 msgstr "(%s/s)"
 
-#: ../src/filetransfers_window.py:507
-#: ../src/filetransfers_window.py:510
+#: ../src/filetransfers_window.py:507 ../src/filetransfers_window.py:510
 msgid "Invalid File"
 msgstr "Fichier non valide"
 
@@ -923,14 +880,12 @@ msgstr "Fichier : "
 msgid "It is not possible to send empty files"
 msgstr "Il n'est pas possible d'envoyer un fichier vide"
 
-#: ../src/filetransfers_window.py:531
-#: ../src/tooltips.py:401
+#: ../src/filetransfers_window.py:531 ../src/tooltips.py:401
 #: ../src/tooltips.py:466
 msgid "Name: "
 msgstr "Nom : "
 
-#: ../src/filetransfers_window.py:533
-#: ../src/tooltips.py:479
+#: ../src/filetransfers_window.py:533 ../src/tooltips.py:479
 msgid "Sender: "
 msgstr "Expéditeur : "
 
@@ -938,8 +893,7 @@ msgstr "Expéditeur : "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/filetransfers_window.py:732
-#: ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Continuer"
 
@@ -969,15 +923,16 @@ msgid "Popup a window with the next unread message"
 msgstr "Afficher une fenêtre avec le prochain message non lu"
 
 #: ../src/gajim-remote.py:91
-msgid "Print a list of all contacts in the roster. Each contact appear on a separate line"
-msgstr "Affiche une liste de tous les contacts de la liste. Chaque contact apparaît sur une ligne séparée"
+msgid ""
+"Print a list of all contacts in the roster. Each contact appear on a "
+"separate line"
+msgstr ""
+"Affiche une liste de tous les contacts de la liste. Chaque contact apparaît "
+"sur une ligne séparée"
 
-#: ../src/gajim-remote.py:94
-#: ../src/gajim-remote.py:109
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135
-#: ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:94 ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:180
 #: ../src/gajim-remote.py:188
 msgid "account"
 msgstr "compte"
@@ -1002,8 +957,7 @@ msgstr "état"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "un de : offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:108
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:132
 msgid "message"
 msgstr "message"
 
@@ -1012,25 +966,37 @@ msgid "status message"
 msgstr "Message d'état"
 
 #: ../src/gajim-remote.py:109
-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 "Change l'état du compte \"compte\". Si aucun n'est spécifié, essaye de changer l'état de tous les compte qui ont l'option \"synchroniser avec l'état global\" activée"
+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 ""
+"Change l'état du compte \"compte\". Si aucun n'est spécifié, essaye de "
+"changer l'état de tous les compte qui ont l'option \"synchroniser avec "
+"l'état global\" activée"
 
 #: ../src/gajim-remote.py:115
 msgid "Show the chat dialog so that you can send messages to a contact"
-msgstr "Montre la fenêtre de discussion pour que vous puissiez envoyer un message à un contact"
+msgstr ""
+"Montre la fenêtre de discussion pour que vous puissiez envoyer un message à "
+"un contact"
 
 #: ../src/gajim-remote.py:118
 msgid "JID of the contact that you want to chat with"
 msgstr "JID du contact avec lequel vous voulez discuter"
 
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:180
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Si spécifié, le contact est pris dan la liste de contact de ce compte"
 
 #: ../src/gajim-remote.py:126
-msgid "Send new 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 "Envoyer un nouveau message à un contact dans la liste. La clé OpenPGP et le compte sont faclutatifs. Si vous voulez renseigner seulement le paramètre 'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
+msgid ""
+"Send new 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 ""
+"Envoyer un nouveau message à un contact dans la liste. La clé OpenPGP et le "
+"compte sont faclutatifs. Si vous voulez renseigner seulement le paramètre "
+"'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
 #: ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
@@ -1056,8 +1022,7 @@ msgstr "Si spécifié, le message sera envoyé en utilisant ce compte"
 msgid "Get detailed info on a contact"
 msgstr "Récupère les informations détaillées d'un contact"
 
-#: ../src/gajim-remote.py:142
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:149
 #: ../src/gajim-remote.py:179
 msgid "JID of the contact"
 msgstr "JID du contact"
@@ -1126,8 +1091,7 @@ msgstr "Ajouter un nouveau contact à ce compte."
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument manquant \"jid_contact\""
 
-#: ../src/gajim-remote.py:214
-#: ../src/gajim-remote.py:543
+#: ../src/gajim-remote.py:214 ../src/gajim-remote.py:543
 msgid "Service not available"
 msgstr "Service non disponible"
 
@@ -1207,11 +1171,16 @@ msgstr "La bibliothèque GTK+ ne contient pas le support de glade"
 
 #: ../src/gajim.py:53
 #, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-msgstr "Supprimez votre version actuelle de la bibliothèque GTK+ et installez la dernière version stable à partir de %s"
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Supprimez votre version actuelle de la bibliothèque GTK+ et installez la "
+"dernière version stable à partir de %s"
 
 #: ../src/gajim.py:55
-msgid "Please make sure that gtk and pygtk have libglade support in your system."
+msgid ""
+"Please make sure that gtk and pygtk have libglade support in your system."
 msgstr "Veuillez vérifier que gtk et pygtk supportent libglade"
 
 #. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
@@ -1228,11 +1197,8 @@ msgstr "Acceptez vous sa requête ?"
 msgid "error while sending"
 msgstr "erreur en envoyant"
 
-#: ../src/gajim.py:553
-#: ../src/gajim.py:564
-#: ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147
-#: ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Général"
 
@@ -1259,44 +1225,48 @@ msgstr "Vous le verrez toujours déconnecté."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Le contact avec \"%s\" ne peut être établi"
 
-#: ../src/gajim.py:602
-#: ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Vérifiez votre connexion ou réessayez plus tard."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "Votre mot de passe est incorrect"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr "la vCard a été publiée avec succés"
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "Your personal information has been published successfully."
 msgstr "Vos informations personnelles ont été publiées avec succès."
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/gajim.py:952
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Une erreur s'est produite lors de la publication de vos informations personnelles, veuillez réessayer plus tard."
+#: ../src/gajim.py:955
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Une erreur s'est produite lors de la publication de vos informations "
+"personnelles, veuillez réessayer plus tard."
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 msgid "Could not save your settings and preferences"
 msgstr "Impossible de sauver vos informations de configuration"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
+msgstr ""
+"Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
 
 #: ../src/gajim_themes_window.py:57
 msgid "Theme"
@@ -1313,7 +1283,8 @@ msgstr "Vous ne pouvez pas supprimer le thème actuellement utilisé"
 
 #: ../src/gajim_themes_window.py:154
 msgid "Please first choose another for your current theme."
-msgstr "Veuillez tout d'abord appliquer un autre thème avant de supprimer celui-ci."
+msgstr ""
+"Veuillez tout d'abord appliquer un autre thème avant de supprimer celui-ci."
 
 #. if we are in many rooms
 #: ../src/groupchat_window.py:150
@@ -1339,8 +1310,7 @@ msgstr "Si vous fermez cette fenêtre, vous serez déconnecté de ce salon."
 msgid "Do _not ask me again"
 msgstr "_Ne plus poser la question."
 
-#: ../src/groupchat_window.py:297
-#: ../src/groupchat_window.py:527
+#: ../src/groupchat_window.py:297 ../src/groupchat_window.py:527
 msgid "This room has no subject"
 msgstr "Ce salon n'a pas de sujet"
 
@@ -1417,12 +1387,12 @@ msgstr "Marque-page ajouté avec succès"
 
 #: ../src/groupchat_window.py:601
 msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Vous pouvez gérer vos marque-pages par le menu Actions de votre liste de contacts."
+msgstr ""
+"Vous pouvez gérer vos marque-pages par le menu Actions de votre liste de "
+"contacts."
 
-#: ../src/groupchat_window.py:778
-#: ../src/groupchat_window.py:793
-#: ../src/groupchat_window.py:876
-#: ../src/groupchat_window.py:890
+#: ../src/groupchat_window.py:778 ../src/groupchat_window.py:793
+#: ../src/groupchat_window.py:876 ../src/groupchat_window.py:890
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Surnom introuvable : %s"
@@ -1430,11 +1400,11 @@ msgstr "Surnom introuvable : %s"
 #: ../src/groupchat_window.py:817
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
-msgstr "Contact %(contact_jid)s invité dans le salon de discussion %(room_jid)s."
+msgstr ""
+"Contact %(contact_jid)s invité dans le salon de discussion %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_window.py:823
-#: ../src/groupchat_window.py:851
+#: ../src/groupchat_window.py:823 ../src/groupchat_window.py:851
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s semble ne pas être un JID valide"
@@ -1451,13 +1421,24 @@ msgstr "Commandes : %s"
 
 #: ../src/groupchat_window.py:926
 #, python-format
-msgid "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname of an occupant may be substituted, but not if it contains \"@\". If the JID is currently in the room, he/she/it will also be kicked. Does NOT support spaces in nickname."
-msgstr "Utilisation : /%s <surnom|JID> [raison], bannit le JID du salon. Le surnom de l'occupant peut être utilisé s'il ne contient pas de \"@\". Si le JID est actuellement dans le salon il sera également éjecté. Ne supporte pas les espaces dans le surnom."
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
+"of an occupant may be substituted, but not if it contains \"@\". If the JID "
+"is currently in the room, he/she/it will also be kicked. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"Utilisation : /%s <surnom|JID> [raison], bannit le JID du salon. Le surnom "
+"de l'occupant peut être utilisé s'il ne contient pas de \"@\". Si le JID est "
+"actuellement dans le salon il sera également éjecté. Ne supporte pas les "
+"espaces dans le surnom."
 
 #: ../src/groupchat_window.py:932
 #, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
-msgstr "Utilisation : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant spécifié."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+msgstr ""
+"Utilisation : /%s <surnom>, ouvre une fenêtre de discussion privée avec "
+"l'occupant spécifié."
 
 #: ../src/groupchat_window.py:935
 #, python-format
@@ -1466,38 +1447,65 @@ msgstr "Utilisation : /%s, nettoie la fenêtre."
 
 #: ../src/groupchat_window.py:938
 #, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-msgstr "Utilisation : /%s [raison], ferme la fenêtre ou l'onglet courrant en affichant la raison si spécifié."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Utilisation : /%s [raison], ferme la fenêtre ou l'onglet courrant en "
+"affichant la raison si spécifié."
 
 #: ../src/groupchat_window.py:941
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
-msgstr "Utilisation : /%s, passe la fenêtre de groupe de discussion en vue compacte."
+msgstr ""
+"Utilisation : /%s, passe la fenêtre de groupe de discussion en vue compacte."
 
 #: ../src/groupchat_window.py:944
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current room, optionally providing a reason."
-msgstr "Utilisation : /%s <JID> [raison], invite le JID dans le salon actuel, la raison est optionnelle."
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"providing a reason."
+msgstr ""
+"Utilisation : /%s <JID> [raison], invite le JID dans le salon actuel, la "
+"raison est optionnelle."
 
 #: ../src/groupchat_window.py:947
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre salon@serveur en option on peut spécifier le surnom utilisé."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre "
+"salon@serveur en option on peut spécifier le surnom utilisé."
 
 #: ../src/groupchat_window.py:950
 #, python-format
-msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the room and optionally displays a reason. Does NOT support spaces in nickname."
-msgstr "Utilisation : /%s <surnom> [raison], supprime l'occupant portant le surnom spécifié du salon et affiche en option la raison. Le surnom ne doit pas contenir d'espaces!"
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the room and optionally displays a reason. Does NOT support spaces in "
+"nickname."
+msgstr ""
+"Utilisation : /%s <surnom> [raison], supprime l'occupant portant le surnom "
+"spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
+"contenir d'espaces!"
 
 #: ../src/groupchat_window.py:954
 #, python-format
-msgid "Usage: /%s <action>, sends action to the current room. Use third person. (e.g. /%s explodes.)"
-msgstr "Utilisation : /%s <action>, envoie l'action au salon actuel. Utilise la troisième personne. (ex : /%s explose.)"
+msgid ""
+"Usage: /%s <action>, sends action to the current room. Use third person. (e."
+"g. /%s explodes.)"
+msgstr ""
+"Utilisation : /%s <action>, envoie l'action au salon actuel. Utilise la "
+"troisième personne. (ex : /%s explose.)"
 
 #: ../src/groupchat_window.py:958
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
-msgstr "Utilisation : /%s <surnom> [message]. ouvre une fenêtre de message privé puis envoit le message à l'occupant portant le surnom spécifié."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message window and sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Utilisation : /%s <surnom> [message]. ouvre une fenêtre de message privé "
+"puis envoit le message à l'occupant portant le surnom spécifié."
 
 #: ../src/groupchat_window.py:961
 #, python-format
@@ -1507,12 +1515,16 @@ msgstr "Utilisation : /%s <surnom>, change votre surnom dans ce salon."
 #: ../src/groupchat_window.py:964
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
-msgstr "Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
+msgstr ""
+"Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
 #: ../src/groupchat_window.py:967
 #, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Utilisation : /%s <message>, envoie un message sans chercher d'autres commandes."
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Utilisation : /%s <message>, envoie un message sans chercher d'autres "
+"commandes."
 
 #: ../src/groupchat_window.py:969
 #, python-format
@@ -1525,8 +1537,7 @@ msgstr "Pas d'aide disponible pour /%s"
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: ../src/groupchat_window.py:1054
-#: ../src/groupchat_window.py:1085
+#: ../src/groupchat_window.py:1054 ../src/groupchat_window.py:1085
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison en-dessous :"
 
@@ -1541,8 +1552,12 @@ msgid "A programming error has been detected"
 msgstr "Une erreur de programmation a été détectée"
 
 #: ../src/gtkexcepthook.py:47
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Elle n'est probablement pas fatale mais devrait quand même être communiquée aux développeurs."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Elle n'est probablement pas fatale mais devrait quand même être communiquée "
+"aux développeurs."
 
 #: ../src/gtkexcepthook.py:53
 msgid "_Report Bug"
@@ -1589,7 +1604,8 @@ msgid "<b>Description</b>"
 msgstr "<b>Description</b>"
 
 #: ../src/gtkgui.glade.h:11
-msgid "<b>Format of a Chat Line</b>"
+#, fuzzy
+msgid "<b>Format of a line</b>"
 msgstr "<b>Format d'une ligne de discussion</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1737,7 +1753,8 @@ msgstr ""
 
 #: ../src/gtkgui.glade.h:50
 msgid "Allow _OS information to be sent"
-msgstr "Autoriser l'envoi des informations concernant votre _système d'exploitation"
+msgstr ""
+"Autoriser l'envoi des informations concernant votre _système d'exploitation"
 
 #: ../src/gtkgui.glade.h:51
 msgid "Allow him/her to see my status"
@@ -1745,7 +1762,9 @@ msgstr "L'autoriser à voir mon état"
 
 #: ../src/gtkgui.glade.h:52
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Autoriser les notifications lorsque je suis _absent/indisponible/occupé/invisible"
+msgstr ""
+"Autoriser les notifications lorsque je suis _absent/indisponible/occupé/"
+"invisible"
 
 #: ../src/gtkgui.glade.h:53
 msgid "Also known as iChat style"
@@ -1820,56 +1839,71 @@ msgid "Bold"
 msgstr "Gras"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "C_onnexion au démarrage"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Annule le transfert de fichier"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Annule le transfert de fichier sélectionné"
 
-#: ../src/gtkgui.glade.h:75
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Annule le transfert de fichier sélectionné et supprime le fichier incomplet"
-
 #: ../src/gtkgui.glade.h:76
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr ""
+"Annule le transfert de fichier sélectionné et supprime le fichier incomplet"
+
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Chan_ger le mot de passe"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Changer de sur_nom"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Changer le _sujet"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Noti_fications d'état de discussion"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Discuter avec"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "_Vérifier l'existence d'une nouvelle version au démarrage"
 
 #: ../src/gtkgui.glade.h:84
-msgid "Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, cause it blocks all messages from any contact that is not in the roster"
-msgstr "Cochez cette option seulement si quelqu'un n'appartenant pas à votre liste vous spamme/ennuie. Utilisez avec précaution, car cette option bloque tous les messages des contacts qui ne sont pas dans votre liste"
+msgid ""
+"Check this option, only if someone you don't have in the roster spams/annoys "
+"you. Use with caution, cause it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Cochez cette option seulement si quelqu'un n'appartenant pas à votre liste "
+"vous spamme/ennuie. Utilisez avec précaution, car cette option bloque tous "
+"les messages des contacts qui ne sont pas dans votre liste"
 
 #: ../src/gtkgui.glade.h:85
-msgid "Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled"
-msgstr "Si vous cochez cette case, Gajim se connectera sur le port 5223, sur lequel les serveurs sont supposés gérer le SSL. Notez que Gajim utilise le cryptage TLS par défaut si le serveur annonce qu'il le supporte, et avec cette option vous désactivez le TLS"
+msgid ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
+msgstr ""
+"Si vous cochez cette case, Gajim se connectera sur le port 5223, sur lequel "
+"les serveurs sont supposés gérer le SSL. Notez que Gajim utilise le cryptage "
+"TLS par défaut si le serveur annonce qu'il le supporte, et avec cette option "
+"vous désactivez le TLS"
 
 #: ../src/gtkgui.glade.h:86
 msgid "Choose _Key..."
@@ -1893,7 +1927,9 @@ msgstr "Cliquez pour insérer une frimousse Alt+E)"
 
 #: ../src/gtkgui.glade.h:91
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Cliquez pour voir les fonctionnalités du serveur jabber (comme les transports MSN, ICQ)"
+msgstr ""
+"Cliquez pour voir les fonctionnalités du serveur jabber (comme les "
+"transports MSN, ICQ)"
 
 #: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversation in this room"
@@ -1961,7 +1997,9 @@ msgstr "Refuser"
 
 #: ../src/gtkgui.glade.h:108
 msgid "Deny authorization from contact so he cannot know when you're connected"
-msgstr "Refuser l'autorisation au contact pour qu'il ne puisse pas savoir quand vous êtes connecté"
+msgstr ""
+"Refuser l'autorisation au contact pour qu'il ne puisse pas savoir quand vous "
+"êtes connecté"
 
 #: ../src/gtkgui.glade.h:109
 msgid "Department:"
@@ -1976,413 +2014,487 @@ msgid "Display status messages of contacts in roster"
 msgstr "Afficher les messages d'état des contacts dans la fenêtre principale"
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "Courriel"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "Courriel :"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Éditer les groupes"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "_Éditer les informations personnelles..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Éditer les _groupes"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Activer"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Entrez le de nouveau pour confirmer :"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Entrez un nouveau mot de passe :"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Événements"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Toutes les 5 _minutes"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Adresse 2 :"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Famille:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Transfert de fichiers"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Transfert de fichiers"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Gestionnaire de fichiers :"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtre :"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Style de la police :"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Police :"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Lui interdire de voir mon état"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Format : AAAA-MM-JJ"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Foire Aux Questions (en ligne)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "De :"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "Parc_ourir"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Personalisation des thèmes de Gajim"
 
+#: ../src/gtkgui.glade.h:138
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact"
+msgstr ""
+"Gajim peut envoyer et recevoir des meta-informations concernant les "
+"conversations que vous pouvez avoir avec un contact"
+
 #: ../src/gtkgui.glade.h:139
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact"
-msgstr "Gajim peut envoyer et recevoir des meta-informations concernant les conversations que vous pouvez avoir avec un contact"
+msgid ""
+"Gajim will automatically show the new received message in a new chat window "
+"or tab in an existing chat window"
+msgstr ""
+"Gajim montrera automatiquement les nouveaux messages reçus dans une nouvelle "
+"fenêtre de discussion ou dans un onglet d'une fenêtre de discussion existante"
 
 #: ../src/gtkgui.glade.h:140
-msgid "Gajim will automatically show the new received message in a new chat window or tab in an existing chat window"
-msgstr "Gajim montrera automatiquement les nouveaux messages reçus dans une nouvelle fenêtre de discussion ou dans un onglet d'une fenêtre de discussion existante"
+msgid ""
+"Gajim will notify you for new message via a popup in the bottom right of the "
+"screen"
+msgstr ""
+"Gajim vous signalera les nouveaux messages dans un popup en bas à droite de "
+"l'écran"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Gajim will notify you for new message via a popup in the bottom right of the screen"
-msgstr "Gajim vous signalera les nouveaux messages dans un popup en bas à droite de l'écran"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed in"
+msgstr ""
+"Gajim vous signalera par une fenêtre popup en bas à droite de l'écran qu'un "
+"contact s'est connecté"
 
 #: ../src/gtkgui.glade.h:142
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed in"
-msgstr "Gajim vous signalera par une fenêtre popup en bas à droite de l'écran qu'un contact s'est connecté"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim vous signalera par une fenêtre popup en bas à droite de l'écran qu'un "
+"contact s'est déconnecté"
 
 #: ../src/gtkgui.glade.h:143
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Gajim vous signalera par une fenêtre popup en bas à droite de l'écran qu'un contact s'est déconnecté"
+msgid ""
+"Gajim will only change the icon of the contact that sent the new message"
+msgstr ""
+"Gajim ne fera que changer l'icône du contact qui a envoyé le nouveau message"
 
 #: ../src/gtkgui.glade.h:144
-msgid "Gajim will only change the icon of the contact that sent the new message"
-msgstr "Gajim ne fera que changer l'icône du contact qui a envoyé le nouveau message"
-
-#: ../src/gtkgui.glade.h:145
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim : Assistant de création de compte"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Prénom :"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Groupe :"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "Connexion HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr "Aide en ligne"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Cache la fenêtre"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Site perso :"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "_Serveur :"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "J'ai déjà un compte que je veux utiliser"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Je veux _créer un nouveau compte"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
-msgstr "Si cette case est cochée, Gajim placera une icône dans la zone de notification"
+msgstr ""
+"Si cette case est cochée, Gajim placera une icône dans la zone de "
+"notification"
+
+#: ../src/gtkgui.glade.h:159
+msgid ""
+"If checked, Gajim will display an avatar, if one is set, for every contact "
+"in roster window"
+msgstr ""
+"Si cette case est cochée, Gajim affichera l'avatar, s'il est disponible, de "
+"chaque contact dans la fenêtre principale"
 
 #: ../src/gtkgui.glade.h:160
-msgid "If checked, Gajim will display an avatar, if one is set, for every contact in roster window"
-msgstr "Si cette case est cochée, Gajim affichera l'avatar, s'il est disponible, de chaque contact dans la fenêtre principale"
+msgid ""
+"If checked, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window"
+msgstr ""
+"Si cette case est cochée, Gajim affichera le message d'état, s'il n'est pas "
+"vide, sous le nom de chaque contact dans la fenêtre principale"
 
 #: ../src/gtkgui.glade.h:161
-msgid "If checked, Gajim will display the status message, if not empty, for every contact under the contact name in roster window"
-msgstr "Si cette case est cochée, Gajim affichera le message d'état, s'il n'est pas vide, sous le nom de chaque contact dans la fenêtre principale"
-
-#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
-msgstr "Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
+msgstr ""
+"Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
+
+#: ../src/gtkgui.glade.h:163
+msgid ""
+"If checked, Gajim will remember the roster and chat window positions in the "
+"screen and the sizes of them next time you run it"
+msgstr ""
+"Si cette case est cochée, Gajim va retenir la position de la fenêtre "
+"principale et des fenêtres de discussion pour vos prochaines utilisations"
 
 #: ../src/gtkgui.glade.h:164
-msgid "If checked, Gajim will remember the roster and chat window positions in the screen and the sizes of them next time you run it"
-msgstr "Si cette case est cochée, Gajim va retenir la position de la fenêtre principale et des fenêtres de discussion pour vos prochaines utilisations"
+msgid ""
+"If checked, Gajim will replace ascii smilies like ':)' with equivalent "
+"graphical emoticons"
+msgstr ""
+"Si cette case est cochée, Gajim va remplacer les frimousses ASCII comme « :) "
+"» par un équivalent graphique"
 
 #: ../src/gtkgui.glade.h:165
-msgid "If checked, Gajim will replace ascii smilies like ':)' with equivalent graphical emoticons"
-msgstr "Si cette case est cochée, Gajim va remplacer les frimousses ASCII comme « :) » par un équivalent graphique"
+msgid ""
+"If checked, Gajim will send keep-alive packets so it prevents connection "
+"timeout which results in disconnection"
+msgstr ""
+"Si coché, Gajim enverra des paquets de maintien de connection pour prévenir "
+"des temps de latence pouvant entraîner des déconnections"
 
 #: ../src/gtkgui.glade.h:166
-msgid "If checked, Gajim will send keep-alive packets so it prevents connection timeout which results in disconnection"
-msgstr "Si coché, Gajim enverra des paquets de maintien de connection pour prévenir des temps de latence pouvant entraîner des déconnections"
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Si cette case est cochée, Gajim va sauvegarder le mot de passe dans ~/.gajim/"
+"config avec accès en lecture pour vous uniquement"
 
 #: ../src/gtkgui.glade.h:167
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Si cette case est cochée, Gajim va sauvegarder le mot de passe dans ~/.gajim/config avec accès en lecture pour vous uniquement"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Si cette case est cochée, Gajim utilisera des icônes d'état spécifiques aux "
+"protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
+"disponible, absent, occupé, etc)"
 
 #: ../src/gtkgui.glade.h:168
-msgid "If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)"
-msgstr "Si cette case est cochée, Gajim utilisera des icônes d'état spécifiques aux protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états disponible, absent, occupé, etc)"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Si cette case est cochée, au démarrage, Gajim se connectera automatiquement "
+"à jabber en utilisant ce compte."
 
 #: ../src/gtkgui.glade.h:169
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Si cette case est cochée, au démarrage, Gajim se connectera automatiquement à jabber en utilisant ce compte."
+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 ""
+"Si cette case est cochée, toute modification de l'état global (accessible à "
+"l'aide du bouton en bas de la fenêtre principale) sera répercutée sur l'état "
+"de ce compte"
 
 #: ../src/gtkgui.glade.h:170
-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 "Si cette case est cochée, toute modification de l'état global (accessible à l'aide du bouton en bas de la fenêtre principale) sera répercutée sur l'état de ce compte"
+msgid ""
+"If you have 2 or more accounts and it is checked, Gajim will list all "
+"contacts as if you had one account"
+msgstr ""
+"Si vous avez 2 comptes ou plus et que cette case est cochée, Gajim va lister "
+"tous les contacts comme si vous n'aviez qu'un seul compte"
 
 #: ../src/gtkgui.glade.h:171
-msgid "If you have 2 or more accounts and it is checked, Gajim will list all contacts as if you had one account"
-msgstr "Si vous avez 2 comptes ou plus et que cette case est cochée, Gajim va lister tous les contacts comme si vous n'aviez qu'un seul compte"
-
-#: ../src/gtkgui.glade.h:172
 msgid "Incoming message:"
 msgstr "Message entrant :"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Information/Demande"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 msgid "Information about you, as stored in the server"
 msgstr "Les informations vous concernant, stockées sur le serveur"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr "Invitation reçue"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Italique"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "Identifiant Jabber :"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "Rejoindre un _groupe de discussion"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Adresse"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Historique"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Gérer les comptes"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Gérer les Marque-pages"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Gérer les émoticônes"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Gérer les profils de proxys"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Modifier..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Racine:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "Mo_dérateur"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Plus"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Une nouvelle version de Gajim est disponible"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Surnom :"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Aucun"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Me Signaler quand un contact : "
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "Syst. d'exploit. :"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "À chaque _message"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Ouvrir la page de téléchargement"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Ouvrir..."
 
-#: ../src/gtkgui.glade.h:204
-#: ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "Encryption OpenPGP"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "Ou choisissez votre message :"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Message sortant :"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "_Mot de passe : "
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 msgid "Personal Information"
 msgstr "Informations personnelles"
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Téléphone :"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "Jouer les _sons"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Port : "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Position :"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "Code postal :"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Préférences"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Préfixe:"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Afficher l'heure :"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "Priori_té:"
 
-#: ../src/gtkgui.glade.h:221
-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 "La priorité est utilisé par Jabber pour déterminer qui reçoit les évenements du serveur quand plusieurs clients sont connectés avec le même compte. Le client ayant la plus haute priorité recevra les messages"
+#: ../src/gtkgui.glade.h:220
+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 ""
+"La priorité est utilisé par Jabber pour déterminer qui reçoit les évenements "
+"du serveur quand plusieurs clients sont connectés avec le même compte. Le "
+"client ayant la plus haute priorité recevra les messages"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Profil, Avatar"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Proxy :"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Récemment :"
@@ -2405,7 +2517,8 @@ msgstr "Supprimer le transfert de fichier de la liste."
 
 #: ../src/gtkgui.glade.h:230
 msgid "Removes completed, canceled and failed file transfers from the list"
-msgstr "Supprimer les transferts de fichier terminés, annulés et échoués de la liste"
+msgstr ""
+"Supprimer les transferts de fichier terminés, annulés et échoués de la liste"
 
 #: ../src/gtkgui.glade.h:231
 msgid "Removing selected file transfer"
@@ -2424,8 +2537,18 @@ msgid "Resour_ce: "
 msgstr "Ressour_ce: "
 
 #: ../src/gtkgui.glade.h:235
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the 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 "La ressource est envoyée au serveur jabber pour différencier les clients connectés au même serveur avec le même compte. Vous pouvez donc être connecté avec le même compte avec les ressources « Maison » et « Travail » en même temps. La ressource avec la plus haute priorité recevra les messages (voir plus bas)."
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the 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 ""
+"La ressource est envoyée au serveur jabber pour différencier les clients "
+"connectés au même serveur avec le même compte. Vous pouvez donc être "
+"connecté avec le même compte avec les ressources « Maison » et « Travail » "
+"en même temps. La ressource avec la plus haute priorité recevra les messages "
+"(voir plus bas)."
 
 #: ../src/gtkgui.glade.h:236
 msgid "Resource:"
@@ -2449,7 +2572,9 @@ msgstr "Enregistrer votre mot de _passe (non sécurisé)"
 
 #: ../src/gtkgui.glade.h:241
 msgid "Save _position and size for roster and chat windows"
-msgstr "Garder la _position et la taille pour la liste de contact et les fenêtres de discussion"
+msgstr ""
+"Garder la _position et la taille pour la liste de contact et les fenêtres de "
+"discussion"
 
 #: ../src/gtkgui.glade.h:242
 msgid "Save conversation _logs for all contacts"
@@ -2468,101 +2593,102 @@ msgid "Send File"
 msgstr "Envoyer un Fichier"
 
 #: ../src/gtkgui.glade.h:246
-msgid "Send New Message"
-msgstr "Envoyer un nouveau message"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Envoyer un _message simple"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "Envoyer un _fichier"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 msgid "Send _New Message..."
 msgstr "Envoyer un _nouveau message..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Envoi des paquets de maintien de connexion"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Envoyer un message"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Envoyer le message et fermer la fenêtre"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr "Envoie un message aux utilisateurs actuellement connectés a ce serveur"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Serveur :"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Fonctionalités des Serveurs"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Mettre MOTD"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Mettre un message du jour"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Choisir un _avatar"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr "Définir un avatar à la connexion"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Mets un message du jour"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr "Montrer tous les _événements en attente"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "Montrer les contacts déc_onnectés"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 msgid "Show _Roster"
 msgstr "Montrer la _liste de contacts"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 msgid "Show _XML Console"
 msgstr "Montrer la console _XML"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Ne montrer que dans la _liste"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Affiche une liste des transferts de fichiers entre vous et les autres"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "Se _connecte"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "Se _déconnecte"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Trier les contacts en fonction de leur état"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "État"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Commencer une _discussion"
@@ -2571,7 +2697,7 @@ msgstr "Commencer une _discussion"
 msgid "State:"
 msgstr "État :"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "État"
 
@@ -2633,8 +2759,12 @@ msgid "Theme:"
 msgstr "Thème :"
 
 #: ../src/gtkgui.glade.h:288
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-msgstr "Cette action supprime les transferts de fichier de la liste. Si le transfert est actif, il est d'abord arrêté puis supprimé"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Cette action supprime les transferts de fichier de la liste. Si le transfert "
+"est actif, il est d'abord arrêté puis supprimé"
 
 #: ../src/gtkgui.glade.h:289
 msgid "Title:"
@@ -2702,11 +2832,21 @@ msgstr "Identifiant :"
 
 #: ../src/gtkgui.glade.h:305
 msgid "When a file transfer is complete show a popup notification"
-msgstr "Quand le transfert de fichier est terminé, montrer une fenêtre de notification"
+msgstr ""
+"Quand le transfert de fichier est terminé, montrer une fenêtre de "
+"notification"
 
 #: ../src/gtkgui.glade.h:306
-msgid "When a new event (message, file transfer request etc..) is received, the following methods may be used to inform you about it. NOTE: New message events only occur if it is a new message from a contact you are not already chatting with"
-msgstr "Lorsqu'un nouvel événement (message, requête de transfert de fichier, etc.) est reçu, les méthodes suivantes peuvent être utilisées pour vous en informer. NB : Les événements de nouveau message ne surviennent que s'ils proviennent d'un contact avec qui vous n'êtes pas en train de parler"
+msgid ""
+"When a new event (message, file transfer request etc..) is received, the "
+"following methods may be used to inform you about it. NOTE: New message "
+"events only occur if it is a new message from a contact you are not already "
+"chatting with"
+msgstr ""
+"Lorsqu'un nouvel événement (message, requête de transfert de fichier, etc.) "
+"est reçu, les méthodes suivantes peuvent être utilisées pour vous en "
+"informer. NB : Les événements de nouveau message ne surviennent que s'ils "
+"proviennent d'un contact avec qui vous n'êtes pas en train de parler"
 
 #: ../src/gtkgui.glade.h:307
 msgid "When new event is received"
@@ -2728,339 +2868,343 @@ msgstr ""
 msgid "Your JID:"
 msgstr "Votre Identifiant Jabber :"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "_Ajouter un Contact..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "_Ajouter à la liste de contacts"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Adresse :"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Administrateur"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "_Avancées"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Autoriser"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Background:"
 msgstr "_Arrière-plan :"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "_Bannir"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "Ajouter ce salon aux _Marque-pages"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "Vue _Compacte    Alt+C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "_Copier le JID/l'Adresse électronique"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Copier l'Adresse du Lien"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "_Refuser"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr "_Découvrir les services"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr "_Découvrir les services..."
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Filter:"
 msgstr "_Filtre :"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Finir"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Group Chat"
 msgstr "_Groupe de discussion"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "_Souligner les fautes d'orthographe"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_Historique"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Serveur :"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Icône dans la zone de notification"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer les messages des contacts qui ne sont pas dans notre liste"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "Identifiant _Jabber : "
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Join New Room..."
 msgstr "Re_joindre un nouveau salon..."
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "_Éjecter"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Log status changes of contacts"
 msgstr "_Inscrire dans l'historique les changements d'état des contacts"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "Courrieleur (mèl) :"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Membre"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "_Regrouper les comptes"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Message"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "_Modifier"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Modify Account..."
 msgstr "_Modifier le Compte..."
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Nom : "
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Jamais"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "Me le _signaler"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "Me _signaler quand un transfert de fichier est terminé"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "_Pouvoirs du contact"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "Utilisateurs En _Ligne"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Ouvrir le courrieleur (mèl)"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir le Lien dans votre navigateur"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "P_ossesseur"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "Mot de _passe : "
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Programme pour lire les sons :"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "L'_afficher"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Port :"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Présence"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Publier"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../src/gtkgui.glade.h:378
-#: ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "_Enlever de la liste de contacts"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Récupérer"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "En_voyer"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "_Envoyer et Fermer"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "_Envoyer un message privé"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "_Envoyer un message au serveur"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "_Envoyer un message simple"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Serveur :"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "_Choisir une image..."
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "_Commencer une discussion"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "É_tat"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Ajouter"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Autorisation"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Utiliser un proxy"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "_Nom"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Voix"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "Console _XML..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "liste des transferts de fichier"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "minutes"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99
-#: ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erreur : impossible d'ouvrir %s en lecture"
@@ -3080,28 +3224,41 @@ msgstr "Erreur lors de l'analyse du fichier :"
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "N'a pas pu écrire dans %s. La gestion des sessions ne foncionnera pas"
 
-#: ../src/history_window.py:57
-#: ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "État :"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Message"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historique de Conversation avec %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s est maintenant %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s est maintenant %(status)s"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "L'état est maintenant : %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "L'état est maintenant : %(status)s"
@@ -3109,7 +3266,9 @@ msgstr "L'état est maintenant : %(status)s"
 #: ../src/notify.py:102
 #, python-format
 msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "%(nickname)s du salon %(room_name)s vous a envoyé un nouveau message.%(nickname)s du salon %(room_name)s vous a envoyé un nouveau message."
+msgstr ""
+"%(nickname)s du salon %(room_name)s vous a envoyé un nouveau message.%"
+"(nickname)s du salon %(room_name)s vous a envoyé un nouveau message."
 
 #. we talk about a name here
 #: ../src/notify.py:106
@@ -3132,7 +3291,8 @@ msgstr "Vous avez bien reçu %(filename)s de la part de %(name)s."
 #: ../src/notify.py:129
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."
+msgstr ""
+"Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."
 
 #: ../src/notify.py:141
 #, python-format
@@ -3171,10 +3331,11 @@ msgstr "Comptes regroupés"
 msgid "You are already in room %s"
 msgstr "Vous êtes déjà dans le salon %s"
 
-#: ../src/roster_window.py:310
-#: ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 msgid "You cannot join a room while you are invisible"
-msgstr "Vous ne pouvez pas joindre un groupe de discussion tant que vous êtes invisible."
+msgstr ""
+"Vous ne pouvez pas joindre un groupe de discussion tant que vous êtes "
+"invisible."
 
 #: ../src/roster_window.py:463
 msgid "_Join New Room"
@@ -3194,153 +3355,166 @@ msgstr "au compte %s"
 msgid "using %s account"
 msgstr "en utilisant le compte %s"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "en tant que %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s est maintenant %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Le transport \"%s\" sera enlevé"
 
-#: ../src/roster_window.py:825
-msgid "You will no longer be able to send and receive messages to contacts from this transport."
-msgstr "Vous ne pourrez plus envoyer et recevoir de messages aux contacts de ce transport."
+#: ../src/roster_window.py:823
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"this transport."
+msgstr ""
+"Vous ne pourrez plus envoyer et recevoir de messages aux contacts de ce "
+"transport."
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Choisissez une clé à assigner au contact"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 msgid "Re_name"
 msgstr "Re_nommer"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "_Connecter"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "_Déconnecter"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "L'Autorisation a été envoyée"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Si \"%s\" accepte cette requête, vous connaîtrez son état."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 msgid "Authorization has been removed"
 msgstr "L'Autorisation a été supprimée"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Le contact \"%s\" sera enlevé de la liste de contacts"
 
-#: ../src/roster_window.py:1399
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-msgstr "En supprimant ce contact, vous supprimez également son autorisation. Le contact \"%s\" vous verra donc toujours déconnecté."
+#: ../src/roster_window.py:1397
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+msgstr ""
+"En supprimant ce contact, vous supprimez également son autorisation. Le "
+"contact \"%s\" vous verra donc toujours déconnecté."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr "Autoriser ce contact à connaître mon état après la suppression"
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Entrez votre mot de passe GPG pour le compte %s"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/roster_window.py:1525
-#: ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: ../src/roster_window.py:1526
-#: ../src/roster_window.py:1586
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-msgstr "Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-vous sûr de vouloir être invisible ?"
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-"
+"vous sûr de vouloir être invisible ?"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
-msgstr "Vous devez créer un compte avant de pouvoir discuter avec d'autres contacts."
+msgstr ""
+"Vous devez créer un compte avant de pouvoir discuter avec d'autres contacts."
 
-#: ../src/roster_window.py:1939
-#: ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Vous avez des messages non-lus"
 
-#: ../src/roster_window.py:1940
-#: ../src/roster_window.py:1946
-msgid "Messages will only be available for reading them later if you have history enabled."
-msgstr "Les messages seront disponibles à une lecture ultérieure si l'archivage de l'historique est actif."
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled."
+msgstr ""
+"Les messages seront disponibles à une lecture ultérieure si l'archivage de "
+"l'historique est actif."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 msgid "Change Status Message..."
 msgstr "Changer le message d'état..."
 
@@ -3350,21 +3524,20 @@ msgstr "_Changer le message d'état..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179
-#: ../src/systray.py:184
-msgid "as "
-msgstr "avec "
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "compte : "
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 msgid "Hide this menu"
 msgstr "Cacher ce menu"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr "Tous les contacts de ce groupe sont déconnectés ou ont des erreurs"
 
-#: ../src/systraywin32.py:278
-#: ../src/systraywin32.py:297
+#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
 #: ../src/tooltips.py:261
 #, python-format
 msgid "Gajim - %d unread message"
@@ -3376,47 +3549,55 @@ msgstr[1] "Gajim - %d messages non-lus"
 #: ../src/tabbed_chat_window.py:225
 #, python-format
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr "%s n'a pas envoyé de clé OpenPGP et vous ne lui en avez pas assigné une"
+msgstr ""
+"%s n'a pas envoyé de clé OpenPGP et vous ne lui en avez pas assigné une"
 
 #. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:376
-#: ../src/tabbed_chat_window.py:434
+#: ../src/tabbed_chat_window.py:376 ../src/tabbed_chat_window.py:434
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vous venez de recevoir un nouveau message de \"%s\""
 
 #: ../src/tabbed_chat_window.py:377
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce message sera perdu."
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
+"message sera perdu."
 
 #: ../src/tabbed_chat_window.py:435
-msgid "If you close this tab and you have history disabled, the message will be lost."
-msgstr "Si vous fermez cet onglet et que l'historique n'est pas activé, le message sera perdu."
+msgid ""
+"If you close this tab and you have history disabled, the message will be "
+"lost."
+msgstr ""
+"Si vous fermez cet onglet et que l'historique n'est pas activé, le message "
+"sera perdu."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Votre message ne peut être envoyé tant que vous n'êtes pas connecté."
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "L'envoi du message privé a échoué"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Vous n'êtes plus dans le salon \"%s\" ou \"%s\" l'a quitté."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Encryption activée"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Encryption désactivée"
 
@@ -3441,8 +3622,7 @@ msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - %d message privé non-lu"
 msgstr[1] "Gajim - %d messages privés non-lus"
 
-#: ../src/tooltips.py:294
-#: ../src/tooltips.py:296
+#: ../src/tooltips.py:294 ../src/tooltips.py:296
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -3455,15 +3635,12 @@ msgstr "Rôle : "
 msgid "Affiliation: "
 msgstr "Affiliation : "
 
-#: ../src/tooltips.py:330
-#: ../src/tooltips.py:424
-#: ../src/tooltips.py:438
+#: ../src/tooltips.py:330 ../src/tooltips.py:424 ../src/tooltips.py:438
 #: ../src/tooltips.py:502
 msgid "Status: "
 msgstr "État : "
 
-#: ../src/tooltips.py:340
-#: ../src/tooltips.py:434
+#: ../src/tooltips.py:340 ../src/tooltips.py:434
 msgid "Resource: "
 msgstr "Ressource : "
 
@@ -3495,8 +3672,7 @@ msgstr "Taille : "
 msgid "Transferred: "
 msgstr "Transféré : "
 
-#: ../src/tooltips.py:505
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:505 ../src/tooltips.py:526
 msgid "Not started"
 msgstr "Non commencé"
 
@@ -3504,8 +3680,7 @@ msgstr "Non commencé"
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: ../src/tooltips.py:511
-#: ../src/tooltips.py:514
+#: ../src/tooltips.py:511 ../src/tooltips.py:514
 msgid "Completed"
 msgstr "Terminé"
 
@@ -3557,8 +3732,7 @@ msgstr "Inconnu"
 msgid "?OS:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:293
-#: ../src/vcard.py:312
+#: ../src/vcard.py:293 ../src/vcard.py:312
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
@@ -3574,22 +3748,19 @@ msgstr "Vous devez être connecté pour récupérer vos informations."
 msgid "creating logs database"
 msgstr "création de la base de donnée de l'historique"
 
-#: ../src/common/check_paths.py:73
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:73 ../src/common/check_paths.py:85
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s est un fichier mais devrait être un répertoire"
 
-#: ../src/common/check_paths.py:74
-#: ../src/common/check_paths.py:86
+#: ../src/common/check_paths.py:74 ../src/common/check_paths.py:86
 #: ../src/common/check_paths.py:93
 msgid "Gajim will now exit"
 msgstr "Gajim va maintenant s'arrêter"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:82
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:82 ../src/common/check_paths.py:98
 #: ../src/common/check_paths.py:101
 #, python-format
 msgid "creating %s directory"
@@ -3621,28 +3792,42 @@ msgid "Not available as a result of being idle"
 msgstr "Non disponible car inactif"
 
 #: ../src/common/config.py:82
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Si vrai ne supprime pas */_ . Donc *abc* sera en gras mais sans supprimer les * *"
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Si vrai ne supprime pas */_ . Donc *abc* sera en gras mais sans supprimer "
+"les * *"
 
 #: ../src/common/config.py:119
 msgid "Add * and [n] in roster title?"
 msgstr "Ajouter * et [n] au titre de la liste des contacts ?"
 
 #: ../src/common/config.py:120
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Nombre de lignes de l'historique à afficher lorsque l'onglet ou la fenêtre de discussion est ouvert à nouveau."
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Nombre de lignes de l'historique à afficher lorsque l'onglet ou la fenêtre "
+"de discussion est ouvert à nouveau."
 
 #: ../src/common/config.py:121
 msgid "How many minutes should last lines from previous conversation last."
-msgstr "Durée de vie en minutes des dernières lignes des conversations précédentes."
+msgstr ""
+"Durée de vie en minutes des dernières lignes des conversations précédentes."
 
 #: ../src/common/config.py:122
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Envoyer le message avec Ctrl+Entrée et aller à la ligne avec Entrée (comportement par défaut du client ICQ de Mirabilis)."
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Envoyer le message avec Ctrl+Entrée et aller à la ligne avec Entrée "
+"(comportement par défaut du client ICQ de Mirabilis)."
 
 #: ../src/common/config.py:124
 msgid "How many lines to store for Ctrl+KeyUP."
-msgstr "Nombre de lignes à stocker pour le rappel des lignes précédentes (avec Ctrl+flèche vers le haut)."
+msgstr ""
+"Nombre de lignes à stocker pour le rappel des lignes précédentes (avec Ctrl"
+"+flèche vers le haut)."
 
 #. which version created the config
 #: ../src/common/config.py:126
@@ -3655,12 +3840,18 @@ msgstr "Utiliser la vue compacte quand vous ouvrez une fenêtre de salon"
 
 #: ../src/common/config.py:129
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Soit une url personnalisée contenant %s où %s est le mot/la phrase, soit \"WIKTIONARY\", ce qui signifie l'utilisation de wikitionary."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Soit une url personnalisée contenant %s où %s est le mot/la phrase, soit "
+"\"WIKTIONARY\", ce qui signifie l'utilisation de wikitionary."
 
 #: ../src/common/config.py:132
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Si cette case est cochée, Gajim pourra être contrôlé à distance via gajim-remote."
+msgstr ""
+"Si cette case est cochée, Gajim pourra être contrôlé à distance via gajim-"
+"remote."
 
 #: ../src/common/config.py:136
 msgid "Ask before closing a group chat tab/window."
@@ -3669,8 +3860,12 @@ msgstr "Demander avant de fermer un onglet ou une fenêtre de discussion."
 #. notif. on file complete
 #. port, used for file transfers
 #: ../src/common/config.py:139
-msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."
-msgstr "Outrepasse le nom d'hôte pour les transferts de fichier en cas de traduction d'adresse/transfert de port."
+msgid ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
+msgstr ""
+"Outrepasse le nom d'hôte pour les transferts de fichier en cas de traduction "
+"d'adresse/transfert de port."
 
 #: ../src/common/config.py:141
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
@@ -3689,254 +3884,288 @@ msgid "Show close button in tab?"
 msgstr "Afficher le bouton fermer sur l'onglet ?"
 
 #: ../src/common/config.py:156
-msgid "A semicolon-separated list of words that will be highlighted in multi-user chat."
-msgstr "Une liste de mots séparés par des points-virgules qui seront mis en surbrillance dans les salons."
+msgid ""
+"A semicolon-separated list of words that will be highlighted in multi-user "
+"chat."
+msgstr ""
+"Une liste de mots séparés par des points-virgules qui seront mis en "
+"surbrillance dans les salons."
 
 #: ../src/common/config.py:157
-msgid "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if trayicon is used."
-msgstr "Si vrai, quitte Gajim quand on clique sur le bouton X du gestionnaire de fenêtre. Cette option n'est prise en compte que si l'icône dans la barre de notification est utilisée."
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+"Si vrai, quitte Gajim quand on clique sur le bouton X du gestionnaire de "
+"fenêtre. Cette option n'est prise en compte que si l'icône dans la barre de "
+"notification est utilisée."
 
 #: ../src/common/config.py:158
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Si vrai, Gajim s'enregistre pour xmpp:// à chaque démarrage."
 
 #: ../src/common/config.py:159
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Si vrai, Gajim affichera dans chaque onglet une icône contenant les messages non-lus. En fonction du thème, cette icône peut être animée."
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Si vrai, Gajim affichera dans chaque onglet une icône contenant les messages "
+"non-lus. En fonction du thème, cette icône peut être animée."
 
 #: ../src/common/config.py:160
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window"
-msgstr "Si vrai, Gajim affichera le message d'état, s'il n'est pas vide, sous le nom de chaque contact dans la fenêtre principale."
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window"
+msgstr ""
+"Si vrai, Gajim affichera le message d'état, s'il n'est pas vide, sous le nom "
+"de chaque contact dans la fenêtre principale."
 
 #: ../src/common/config.py:162
-msgid "If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cache that is too old."
-msgstr "Si vrai demandera son avatar à chaque contact qui n'en avait pas la fois précédente ou dont la version en cache a expiré."
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cache that is too old."
+msgstr ""
+"Si vrai demandera son avatar à chaque contact qui n'en avait pas la fois "
+"précédente ou dont la version en cache a expiré."
 
 #: ../src/common/config.py:163
-msgid "If False, you will no longer see status line in chats when a contact changes his or her status and/or his status message."
-msgstr "Si faux, vous ne verrez plus les lignes d'état dans les conversations quand un contact modifie son état et/ou son message d'état."
+msgid ""
+"If False, you will no longer see status line in chats when a contact changes "
+"his or her status and/or his status message."
+msgstr ""
+"Si faux, vous ne verrez plus les lignes d'état dans les conversations quand "
+"un contact modifie son état et/ou son message d'état."
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Dors"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Mange"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Je mange, donc laissez moi un message."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Travail"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Dehors"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Je suis dehors à profiter de la vie"
 
-#: ../src/common/config.py:338
-msgid "Sound to play when a MUC message contains one of the words in muc_highlight_words, or when a MUC message contains your nickname."
-msgstr "Son à jouer lorsqu'un message de salon contient un des mots de muc_highlight_words, ou lorsqu'un message de salon contient votre surnom."
+#: ../src/common/config.py:337
+msgid ""
+"Sound to play when a MUC message contains one of the words in "
+"muc_highlight_words, or when a MUC message contains your nickname."
+msgstr ""
+"Son à jouer lorsqu'un message de salon contient un des mots de "
+"muc_highlight_words, ou lorsqu'un message de salon contient votre surnom."
 
-#: ../src/common/config.py:339
-msgid "Sound to play when any MUC message arrives. (This setting is taken into account only if notify_on_all_muc_messages is True)"
-msgstr "Son à jouer lorsqu'un message quelconque de salon arrive. (Ce réglage est pris en compte seulement si notify_on_all_muc_messages est vrai)"
+#: ../src/common/config.py:338
+msgid ""
+"Sound to play when any MUC message arrives. (This setting is taken into "
+"account only if notify_on_all_muc_messages is True)"
+msgstr ""
+"Son à jouer lorsqu'un message quelconque de salon arrive. (Ce réglage est "
+"pris en compte seulement si notify_on_all_muc_messages est vrai)"
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr "vert"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr "épicerie"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr "Humain"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 msgid "marine"
 msgstr "bleu marine"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr "standard"
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437
-#: ../src/common/connection.py:440
-#: ../src/common/connection.py:443
-#: ../src/common/connection.py:446
-#: ../src/common/connection.py:449
-#: ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr "Un mot de passe est requis pour rejoindre ce salon."
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 msgid "You are banned from this room."
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 msgid "You are not in the members list."
 msgstr "Vous n'êtes pas dans la liste des membres."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
-"Le surnom que vous vouliez utiliser est actuellement utilisé ou enregistré par un autre occupant.\n"
+"Le surnom que vous vouliez utiliser est actuellement utilisé ou enregistré "
+"par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/common/connection.py:486
-#: ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nous ne sommes plus dans la liste de %s"
 
-#: ../src/common/connection.py:531
-#: ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: ../src/common/connection.py:532
-#: ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Pour continuer à envoyer et recevoir des messages, vous devez vous reconnecter."
+msgstr ""
+"Pour continuer à envoyer et recevoir des messages, vous devez vous "
+"reconnecter."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 "je Jid %s ne respecte pas la norma RFC. Il ne sera pas ajouté a votre liste de contact. Utiliser un outil de gestion de liste de contact tel que http://jru.jabberstudio.org/ pour le supprimer"
+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 ""
+"je Jid %s ne respecte pas la norma RFC. Il ne sera pas ajouté a votre liste "
+"de contact. Utiliser un outil de gestion de liste de contact tel que http://"
+"jru.jabberstudio.org/ pour le supprimer"
 
-#: ../src/common/connection.py:1611
-#: ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossible de se connecter à \"%s\""
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Connecté au serveur %s:%s avec %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Vérifiez votre connexion ou réessayer plus tard"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Echec de l'authentification avec \"%s\""
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Vérifiez si votre identifiant et votre mot de passe sont corrects."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "Mot de passe OpenPGP non renseigné"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Vous serez connecté à %s sans OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "invisible"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "Déconnecté"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "Je suis %s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[ce message est chiffré]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -3945,17 +4174,17 @@ msgstr ""
 "Sujet : %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
-msgstr "L'information d'enregistrement pour le transport %s n'est pas arrivée à temps"
+msgstr ""
+"L'information d'enregistrement pour le transport %s n'est pas arrivée à temps"
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 msgid "Timeout"
 msgstr "Dépassement de temps"
 
-#: ../src/common/connection.py:2354
-#: ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr "Une erreur de protocole s'est produite :"
 
@@ -4163,8 +4392,14 @@ msgid "has closed the chat window or tab"
 msgstr "a fermé la fenêtre ou l'onglet de discussion"
 
 #: ../src/common/logger.py:31
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install pysqlite3, if you want to migrate your logs to the new database, please read: http://trac.gajim.org/wiki/MigrateLogToDot9DB Exiting..."
-msgstr "pysqlite2 (ou python-pysqlite2) n'est pas installé. Aprés avoir installé pysqlite2, si vous voulez migrer votre historique dans la nouvelle base de donnée, lisez http://trac.gajim.org/wiki/MigrateLogToDot9DB. Quitte..."
+msgid ""
+"pysqlite2 (aka python-pysqlite2) dependency is missing. After you install "
+"pysqlite3, if you want to migrate your logs to the new database, please "
+"read: http://trac.gajim.org/wiki/MigrateLogToDot9DB Exiting..."
+msgstr ""
+"pysqlite2 (ou python-pysqlite2) n'est pas installé. Aprés avoir installé "
+"pysqlite2, si vous voulez migrer votre historique dans la nouvelle base de "
+"donnée, lisez http://trac.gajim.org/wiki/MigrateLogToDot9DB. Quitte..."
 
 #. we talk about a file
 #: ../src/common/optparser.py:56
@@ -4172,6 +4407,27 @@ msgstr "pysqlite2 (ou python-pysqlite2) n'est pas installé. Aprés avoir instal
 msgid "error: cannot open %s for reading"
 msgstr "erreur: impossible d'ouvrir %s en lecture"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Nouveau message en tant que %s"
+
+#~ msgid "Chat with"
+#~ msgstr "Discuter avec"
+
+#~ msgid "E-Mail"
+#~ msgstr "Courriel"
+
+#~ msgid "Send New Message"
+#~ msgstr "Envoyer un nouveau message"
+
+#~ msgid "as %s"
+#~ msgstr "en tant que %s"
+
+#~ msgid "as "
+#~ msgstr "avec "
+
 #~ msgid "Send _New Message"
 #~ msgstr "Envoyer un _nouveau message"
-
diff --git a/po/gajim.pot b/po/gajim.pot
index accdbcfa3..b8576f00e 100644
--- a/po/gajim.pot
+++ b/po/gajim.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr ""
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr ""
@@ -51,39 +51,40 @@ msgstr ""
 msgid "Hidden"
 msgstr ""
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr ""
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr ""
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr ""
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr ""
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr ""
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -93,242 +94,244 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr ""
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr ""
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr ""
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr ""
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr ""
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr ""
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr ""
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr ""
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr ""
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr ""
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr ""
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr ""
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr ""
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr ""
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr ""
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr ""
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr ""
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr ""
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr ""
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr ""
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr ""
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr ""
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr ""
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr ""
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr ""
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr ""
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr ""
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr ""
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr ""
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr ""
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr ""
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
 msgstr ""
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr ""
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr ""
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr ""
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr ""
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr ""
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr ""
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr ""
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 msgid "Invalid username"
 msgstr ""
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 msgid "You must provide a username to configure this account."
 msgstr ""
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr ""
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr ""
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 msgid "Account has been added successfully"
 msgstr ""
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
 msgstr ""
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 msgid "Your new account has been created successfully"
 msgstr ""
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr ""
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr ""
 
@@ -372,13 +375,14 @@ msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr ""
@@ -472,156 +476,159 @@ msgstr ""
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 
-#: ../src/dialogs.py:651
+#: ../src/dialogs.py:649
 #, python-format
-msgid "Join Group Chat as %s"
+msgid "Join Group Chat with account %s"
 msgstr ""
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr ""
 
-#: ../src/dialogs.py:735
+#: ../src/dialogs.py:731
 #, python-format
-msgid "New Message as %s"
+msgid "Start Chat with account %s"
 msgstr ""
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
+#: ../src/dialogs.py:733
+msgid "Start Chat"
 msgstr ""
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr ""
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr ""
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr ""
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr ""
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr ""
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr ""
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr ""
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr ""
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr ""
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr ""
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 msgid "New Private Message"
 msgstr ""
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, python-format
 msgid "From %s in room %s"
 msgstr ""
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr ""
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr ""
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr ""
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr ""
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr ""
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr ""
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1046
 #, python-format
-msgid "Single Message as %s"
+msgid "Single Message with account %s"
 msgstr ""
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr ""
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr ""
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr ""
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr ""
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr ""
@@ -682,7 +689,7 @@ msgstr ""
 msgid "Re_gister"
 msgstr ""
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr ""
 
@@ -701,7 +708,7 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr ""
 
@@ -752,7 +759,7 @@ msgstr ""
 msgid "File transfer completed"
 msgstr ""
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr ""
 
@@ -857,7 +864,7 @@ msgstr ""
 msgid "Pause"
 msgstr ""
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr ""
 
@@ -1141,8 +1148,8 @@ msgstr ""
 msgid "error while sending"
 msgstr ""
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr ""
 
@@ -1169,31 +1176,31 @@ msgstr ""
 msgid "Contact with \"%s\" cannot be established"
 msgstr ""
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr ""
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr ""
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr ""
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "Your personal information has been published successfully."
 msgstr ""
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1201,11 +1208,11 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 msgid "Could not save your settings and preferences"
 msgstr ""
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
@@ -1513,7 +1520,7 @@ msgid "<b>Description</b>"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:11
-msgid "<b>Format of a Chat Line</b>"
+msgid "<b>Format of a line</b>"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:12
@@ -1733,43 +1740,43 @@ msgid "Bold"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:72
-msgid "C_onnect on Gajim startup"
+msgid "Build custom query"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:73
-msgid "Cancel file transfer"
+msgid "C_onnect on Gajim startup"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:74
-msgid "Cancels the selected file transfer"
+msgid "Cancel file transfer"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:75
-msgid "Cancels the selected file transfer and removes incomplete file"
+msgid "Cancels the selected file transfer"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:76
-msgid "Chan_ge Password"
+msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:77
-msgid "Change Password"
+msgid "Chan_ge Password"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:78
-msgid "Change _Nickname"
+msgid "Change Password"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:79
+msgid "Change _Nickname"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:81
-msgid "Chat state noti_fications:"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:82
-msgid "Chat with"
+msgid "Chat state noti_fications:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:83
@@ -1896,448 +1903,448 @@ msgid "Display status messages of contacts in roster"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr ""
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr ""
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr ""
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
 "etc...)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr ""
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 msgid "Information about you, as stored in the server"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr ""
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 msgid "Personal Information"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr ""
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 ""
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr ""
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr ""
@@ -2428,101 +2435,101 @@ msgid "Send File"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:246
-msgid "Send New Message"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 msgid "Send _New Message..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 msgid "Show _Roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 msgid "Show _XML Console"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr ""
 
+#: ../src/gtkgui.glade.h:269
+msgid "Sta_tus"
+msgstr ""
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr ""
@@ -2531,7 +2538,7 @@ msgstr ""
 msgid "State:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr ""
 
@@ -2692,332 +2699,338 @@ msgstr ""
 msgid "Your JID:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Background:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Contents"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Filter:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Group Chat"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr ""
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Join New Room..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Modify Account..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr ""
 
@@ -3042,27 +3055,39 @@ msgstr ""
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+msgid "Date"
+msgstr ""
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+msgid "Message"
+msgstr ""
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr ""
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr ""
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr ""
@@ -3131,7 +3156,7 @@ msgstr ""
 msgid "You are already in room %s"
 msgstr ""
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 msgid "You cannot join a room while you are invisible"
 msgstr ""
 
@@ -3153,157 +3178,157 @@ msgstr ""
 msgid "using %s account"
 msgstr ""
 
-#: ../src/roster_window.py:521
+#: ../src/roster_window.py:519
 #, python-format
-msgid "as %s"
+msgid "with account %s"
 msgstr ""
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr ""
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr ""
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr ""
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr ""
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr ""
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr ""
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr ""
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 msgid "Re_name"
 msgstr ""
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr ""
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr ""
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 msgid "_Change Status Message"
 msgstr ""
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr ""
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr ""
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr ""
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 msgid "Authorization has been removed"
 msgstr ""
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr ""
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr ""
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr ""
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr ""
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr ""
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr ""
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr ""
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr ""
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr ""
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 msgid "Change Status Message..."
 msgstr ""
 
@@ -3313,15 +3338,15 @@ msgstr ""
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
+#: ../src/systray.py:177 ../src/systray.py:182
+msgid "with account "
 msgstr ""
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 msgid "Hide this menu"
 msgstr ""
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr ""
 
@@ -3358,29 +3383,29 @@ msgid ""
 msgstr ""
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr ""
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr ""
 
@@ -3689,240 +3714,240 @@ msgid ""
 "his or her status and/or his status message."
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr ""
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr ""
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr ""
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr ""
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr ""
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr ""
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr ""
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 msgid "marine"
 msgstr ""
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr ""
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr ""
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr ""
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 msgid "You are banned from this room."
 msgstr ""
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr ""
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr ""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 msgid "You are not in the members list."
 msgstr ""
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr ""
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr ""
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr ""
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr ""
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr ""
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr ""
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr ""
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr ""
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr ""
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr ""
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr ""
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr ""
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr ""
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr ""
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr ""
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr ""
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
 "%s"
 msgstr ""
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 msgid "Timeout"
 msgstr ""
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr ""
 
@@ -4141,3 +4166,7 @@ msgstr ""
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr ""
+
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
diff --git a/po/it/LC_MESSAGES/gajim.po b/po/it/LC_MESSAGES/gajim.po
index 4141a5c27..1abaab616 100644
--- a/po/it/LC_MESSAGES/gajim.po
+++ b/po/it/LC_MESSAGES/gajim.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-11-21 16:43+0100\n"
 "Last-Translator: Mauro Brenna <malloblenne@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Un client Jabber GTK+"
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -52,39 +52,40 @@ msgstr "(Nessuna)"
 msgid "Hidden"
 msgstr "Nascosto"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Chat di gruppo"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "account: "
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "non nel roster"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Cambiare in %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -100,166 +101,168 @@ msgstr ""
 "\n"
 "Non verrà usata la caratteristica di evidenziatura parole scorrette"
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Ogni %s _minuti"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Attivo"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Suono"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "testo del messaggio di stato"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Scegliere il suono"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "Non è possibile usare OpenPGP su questo computer"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Il nome account non è valido"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Il nome account non può essere vuoto."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber deve essere nella forma \"utente@nomeserver\"."
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Voce non valida"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "È necessario creare un nuovo account prima di poter modificare le "
 "informazioni personali."
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Non si è connessi al server"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali"
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Fallimento nella ricezione delle chiavi segrete"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP"
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Scegliere la chiave OpenPGP"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Nessuna chiave selezionata"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Server"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Trasporti"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Testo"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Immagine"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "L'immagine è troppo grande."
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -267,64 +270,64 @@ msgstr ""
 "L'immagine dell'emoticon deve avere altezza e larghezza minori o uguali a 24 "
 "pixel."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Scegli immagine"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Cancellazione account %s"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Se viene rimosso, la connessione verrà persa."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Nuova stanza"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Controllare di avere compilato i campi server e stanza, o eliminare questo "
 "segnalibro."
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Password non valida"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "È necessario inserire una password per il nuovo account."
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -333,19 +336,19 @@ msgstr ""
 "\", o farlo più tardi cliccando alla voce Account nel menu Modifica della "
 "finestra principale."
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 msgid "Your new account has been created successfully"
 msgstr "Il nuovo account è stato creato con successo"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr "È avvenuto un errore durante la creazione dell'account"
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
 
@@ -391,13 +394,14 @@ msgid "Yesterday"
 msgstr "Ieri"
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr "%i giorni fa"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Oggetto: %s\n"
@@ -494,27 +498,26 @@ msgstr "Richiesta di abbonamento da %s"
 msgid "You can not join a group chat unless you are connected."
 msgstr "Non è possibile unirsi a chat di gruppo quando non si è connessi."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Entrare in chat di gruppo come %s"
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Entrare in chat di gruppo"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Nuovo messaggio come %s"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "per l'account %s"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Nuovo messaggio"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "_Inizia chat"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -523,129 +526,134 @@ msgstr ""
 "mandare un messaggio di chat:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurarsi di essere connesso con \"%s\"."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Senza una connessione, non è possibile cambiare la password."
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "È necessario inserire una password."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "Le password immesse nei due campi devono essere identiche."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Nuovo messaggio"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Nuovo messaggio singolo"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, python-format
 msgid "From %s in room %s"
 msgstr "Da %s nella stanza %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "Da %s"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento file"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Errore nel trasferimento file"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Trasferimento file fermato"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "A %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Messaggio singolo come %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Messaggio singolo:"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Manda %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "Ricevuto %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML per %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Sei stato invitato nella stanza %(room_jid)s da %(contact_jid)s"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
@@ -709,7 +717,7 @@ msgstr "Questo servizio non contiene oggetti da consultare."
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "_Modifica"
 
@@ -728,7 +736,7 @@ msgstr "Utenti"
 msgid "Description"
 msgstr "Descrizione"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Entra"
 
@@ -779,7 +787,7 @@ msgstr "Memorizzato in: %s"
 msgid "File transfer completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Apri cartella"
 
@@ -884,7 +892,7 @@ msgstr "Mittente: "
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Continua"
 
@@ -1190,8 +1198,8 @@ msgstr "Accettare questa richiesta?"
 msgid "error while sending"
 msgstr "errore durante l'invio"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Generale"
 
@@ -1218,31 +1226,31 @@ msgstr "Lo vedrai sempre come offline."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non si può contattare \"%s\""
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Controllare la connessione o riprovare più tardi."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "Passphrase errata"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Si è connessi senza la chiave OpenPGP"
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr "successo nella pubblicazione della vCard"
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "Your personal information has been published successfully."
 msgstr "Le informazioni personali sono state pubblicate con successo."
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr "pubblicazione della vCard fallita"
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1252,12 +1260,12 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 #, fuzzy
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare le preferenze"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Supporto gestione sessioni non disponibile (modulo gnome.ui mancante)"
 
@@ -1593,7 +1601,8 @@ msgid "<b>Description</b>"
 msgstr "<b>Descrizione</b>"
 
 #: ../src/gtkgui.glade.h:11
-msgid "<b>Format of a Chat Line</b>"
+#, fuzzy
+msgid "<b>Format of a line</b>"
 msgstr "<b>Formattazione della linea di chat</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1826,45 +1835,45 @@ msgid "Bold"
 msgstr "Grassetto"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "_Connetti all'avvio di Gajim"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Annulla trasferimento file"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Annulla il trasferimento file selezionato"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Annulla il trasferimento file selezionato e rimuove il file incompleto"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "_Cambia password"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Cambia password"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Cambia _nickname"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Cambia _oggetto"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Noti_fiche dello stato di chat"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Chatta con"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Cerca nuove _versioni di Gajim all'avvio"
@@ -1999,104 +2008,100 @@ msgid "Display status messages of contacts in roster"
 msgstr "Mostra i messaggi di stato dei contatti nel roster"
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Modifica gruppi"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "Modifica informazioni personali..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Modifica _gruppi"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Abilita"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Inserire nuovamente per conferma:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Inserire nuova password:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Eventi"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Ogni _5 minuti"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Indirizzo extra:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Cognome:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Trasferimenti file"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Trasferimenti file"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "File manager:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Stile carattere:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Carattere:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-GG"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Domande frequenti (online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Da:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "_Vai"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Personalizzazione temi di Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2104,7 +2109,7 @@ msgstr ""
 "Gajim può ricevere ed inviare meta-informazioni relative ad una "
 "conversazione che con un contatto."
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2112,7 +2117,7 @@ msgstr ""
 "Gajim mostrerà automaticamente i nuovi messaggi ricevuti in una nuova "
 "finestra chat o in una scheda di una finestra chat preesistente"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2120,7 +2125,7 @@ msgstr ""
 "Gajim notificherà i nuovi messaggi tramite popup nell'angolo in fondo a "
 "destra dello schermo"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2128,7 +2133,7 @@ msgstr ""
 "Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
 "quando un contatto si connette"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2136,63 +2141,63 @@ msgstr ""
 "Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
 "quando un contatto si disconnette"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajim cambierà solamente l'icona del contatto che ha mandato il nuovo "
 "messaggio"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente creazione account"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Nome:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Gruppo:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "Connessione HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr "Aiuto online"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Nasconde la finestra"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Nome dell'host: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "Ho già un account da usare"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Voglio _registrare un nuovo account"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Vorrei aggiungerti alla mia lista contatti."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Se marcato, Gajim ha anche un'icona nell'area di notifica"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
@@ -2200,7 +2205,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà un avatar, se ne è impostato uno, per ogni "
 "contatto nella finestra del roster"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -2208,15 +2213,15 @@ msgstr ""
 "Se marcato, Gajim mostrerà il messaggio di stato di ogni contatto, se non "
 "vuoto, sotto il nome del contatto nella finestra del roster"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Se marcato, all'avvio Gajim entrerà in questa chat di gruppo"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcato, Gajim ricorderà la password per questo account"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2224,7 +2229,7 @@ msgstr ""
 "Se marcato, Gajim manterrà le posizioni delle finestre di chat e del roster "
 "sullo schermo la prossima volta che verrà eseguito"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2232,7 +2237,7 @@ msgstr ""
 "Se marcato, Gajim  sostituirà gli smiley ASCII come ':)' con gli equivalenti "
 "emoticon grafici"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2240,7 +2245,7 @@ msgstr ""
 "Se marcato, Gajim invierà dei pacchetti di keep-alive per prevenire il "
 "timeout che provoca una disconnessione"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2248,7 +2253,7 @@ msgstr ""
 "Se marcato, Gajim memorizzerà la password in ~/.gajim/config, con permessi "
 "di lettura solo per l'utente che esegue il programma"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2258,7 +2263,7 @@ msgstr ""
 "(es., un contatto MSN avrà l'icona MSN equivalente per gli stati online, "
 "assente, occupato, ecc...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2266,7 +2271,7 @@ msgstr ""
 "Se marcato, Gajim, quando lanciato, si connetterà automaticamente a Jabber "
 "usando questo account."
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 "
@@ -2275,7 +2280,7 @@ msgstr ""
 "Se marcato, ogni cambio allo stato globale (gestito dalla combo box in fondo "
 "alla finestra del roster) cambierà di conseguenza lo stato di questo account"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2283,179 +2288,179 @@ msgstr ""
 "Se marcato e se sono presenti 2 o più account, Gajim mostrerà tutti i "
 "contatti come se ci fosse un unico account"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Messaggio in arrivo:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Info/Richiesta (Info/Query)"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 msgid "Information about you, as stored in the server"
 msgstr "Informazioni su di te, archiviate sul server"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr "Invito ricevuto"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Corsivo"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "ID Jabber: "
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "Entra in chat di _gruppo"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Posizione"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Cronologia log"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Gestisci account"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Gestisci segnalibri"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Gestisci emoticon"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Gestisci profili proxy"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Gestisci..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Secondo nome:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "Mo_deratore"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Ancora"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Nuova versione di Gajim disponibile"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Nickname:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Nessuno"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Notificare i contatti che eseguono:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "In _tutti i messaggi"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Apri pagina di download"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Apri..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "Cifratura OpenPGP"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "O seleziona un messaggio predefinito:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Messaggio in uscita:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 msgid "Personal Information"
 msgstr "Informazioni personali"
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Telefono:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "Riproduci _suoni"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Porta: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Posizione:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "Codice postale:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Preferenze"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Prefisso:"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Stampa ora:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "Pr_iorità:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2465,18 +2470,22 @@ msgstr ""
 "server Jabber, quando due o più client sono connessi usando lo stesso "
 "account; il client con la maggiore priorità riceverà gli eventi."
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Profilo, avatar"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Protocollo:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Proxy:"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Recentemente:"
@@ -2573,101 +2582,102 @@ msgid "Send File"
 msgstr "Invia file"
 
 #: ../src/gtkgui.glade.h:246
-msgid "Send New Message"
-msgstr "Invia nuovo messaggio"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Invia _messaggio singolo"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "Invia _file"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 msgid "Send _New Message..."
 msgstr "Invia _nuovo messaggio..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Invia pacchetti di keep-alive"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Invia messaggio"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Invia messaggio e chiudi la finestra"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr "Invia un messaggio agli utenti attualmenti connessi a questo server"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Servizi del server"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Imposta MOTD"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Imposta messaggio del giorno"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Imposta _avatar"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr "Imposta un avatar quando mi connetto"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Imposta messaggio del giorno"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr "Mostra tutti gli _eventi pendenti"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "Mostra contatti _offline"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 msgid "Show _Roster"
 msgstr "Mostra _roster"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 msgid "Show _XML Console"
 msgstr "Mostra console _XML"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Mostra solo nel _roster"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Mostra una lista dei trasferimenti di file tra te e gli altri"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "C_onnessione"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "_Disconnessione"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Ordina i contatti per stato"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Stato"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Avvia _chat"
@@ -2676,7 +2686,7 @@ msgstr "Avvia _chat"
 msgid "State:"
 msgstr "Regione:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Stato"
 
@@ -2846,333 +2856,339 @@ msgstr ""
 msgid "Your JID:"
 msgstr "Il tuo JID:"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Azioni"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "_Aggiungi Contatto..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "_Aggiungi al roster"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Indirizzo:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Amministratore"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "_Avanzato"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Autorizza"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Background:"
 msgstr "_Sfondo:"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "_Bandisci"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "Inserire un _segnalibro per questa stanza"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "_Vista compatta    Alt+C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Contents"
 msgstr "_Contenuti"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "_Copia Indirizzo Email/JID"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Copia indirizzo collegamento"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "_Nega"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr "_Ricerca servizi"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr "_Ricerca servizi..."
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Fine"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Group Chat"
 msgstr "Chat di _gruppo"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "Evidenzia _parole scorrette"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_Cronologia"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Host:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "I_Q"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Icona nell'area di notifica"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignora gli eventi da contatti non in roster"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Join New Room..."
 msgstr "Entra in nuova stanza"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "_Caccia"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 #, fuzzy
 msgid "_Log status changes of contacts"
 msgstr "Mostra i messaggi di stato dei contatti nel roster"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "_Client mail:"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "_Unisci account"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Messaggio"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "_Modifica"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Modify Account..."
 msgstr "_Modifica account..."
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Nome: "
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Mai"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "_Notifica"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notifica quando un trasferimento file viene completato"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "Azioni _partecipanti"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "Utenti _online"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Apri composizione email"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "_Apri il collegamento nel browser"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "_Proprietario"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Riproduttore:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "_Mostra"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Preferenze"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Presenza"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Pubblica"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "_Elimina"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "_Elimina dal roster"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "_Rispondi"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Recupera"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "_Invia"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "_Invia e Chiudi"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "_Invia messaggio privato"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "_Invia messaggio server"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "_Invia messaggio singolo"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "_Imposta immagine..."
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "_Inizia chat"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Stato"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "A_bbonati"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Abbonamento"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Usa proxy"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "_Nome utente:"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Voce"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "Console _XML..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "lista trasferimenti file"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "minuti"
 
@@ -3198,27 +3214,41 @@ msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Non si è potuto scrivere su %s. Il supporto gestione sessioni non funzionerà"
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Regione:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Messaggio"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Cronologia conversazione con %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ora è %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s è ora %(status)s\n"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s\n"
@@ -3288,7 +3318,7 @@ msgstr "Account uniti"
 msgid "You are already in room %s"
 msgstr "Sei già nella stanza %s"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 msgid "You cannot join a room while you are invisible"
 msgstr "Non è possibile unirsi ad una stanza quando si è invisibile"
 
@@ -3310,27 +3340,27 @@ msgstr "all'account %s"
 msgid "using %s account"
 msgstr "usando l'account %s"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "come %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "per l'account %s"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "per l'account %s"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s è ora %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3338,68 +3368,68 @@ msgstr ""
 "Non sarai in grado di mandare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "Assegna chiave OpenPGP"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Seleziona una chiave da applicare al contatto"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Vorrei aggiungerti al mio roster"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 msgid "Re_name"
 msgstr "Ri_nomina"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "_Connetti"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "_Disconnetti"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 msgid "_Change Status Message"
 msgstr "_Cambia messaggio di stato"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "L'autorizzazione è stata inviata"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "La richiesta di abbonamento è stata inviata"
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" accetta questa richiesta conoscerai il suo stato."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "L'autorizzazione è stata inviata"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Lo vedrai sempre come offline."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dal tuo roster"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3407,41 +3437,41 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr "Voglio che questo contatto conosca il mio stato dopo la rimozione"
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Memorizza password"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Passphrase richiesta"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Inserire la passphrase della chiave GPG per l'account %s"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Memorizza passphrase"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr "Stai partecipando ad una o più chat di gruppo"
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3449,20 +3479,20 @@ msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste chat di "
 "gruppo. Diventare veramente invisibile?"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "È necessario creare un account prima di poter chattare con altri contatti."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Ci sono messaggi non letti"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3470,7 +3500,7 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata"
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 msgid "Change Status Message..."
 msgstr "Cambia messaggio di stato..."
 
@@ -3480,15 +3510,16 @@ msgstr "_Cambia messaggio di stato..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "come "
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "account: "
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 msgid "Hide this menu"
 msgstr "Nascondi questo menu"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr "Tutti i contatti in questo gruppo sono offline o hanno errori"
 
@@ -3530,29 +3561,29 @@ msgstr ""
 "messaggio verrà perso."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "Nessuna connessione disponibile"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Il messaggio non può venire inviato finché non si è connessi."
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Invio messaggio privato fallito"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Non sei più nella stanza \"%s\" o \"%s\" è uscito."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Cifratura attivata"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Cifratura disattivata"
 
@@ -3892,59 +3923,59 @@ msgstr ""
 "Se Falso, non si vedrà più la linea di stato nelle chat quando un contatto "
 "cambia stato o messaggio di stato."
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Dormo"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Torno presto"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "Di ritorno tra qualche minuto."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Mangio"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Sto mangiando, lascia pure un messaggio"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Sto guardando un film."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Lavoro"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Sto lavorando."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Sono al telefono"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Fuori"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Sono fuori a divertirmi"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -3952,7 +3983,7 @@ msgstr ""
 "Suono da riprodurre quando un messaggio MUC contiene una delle parole in "
 "muc_highlight_words, o quando un messaggio MUC contiene il tuo nickname."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -3961,61 +3992,61 @@ msgstr ""
 "valore solo se notify_on_all_muc_messages è Vero)."
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr "drogheria"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr "umano"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr "semplice"
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Non è possibile entrare nella stanza"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr "È necessaria una password per entrare in questa stanza."
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 msgid "You are banned from this room."
 msgstr "Sei bandito da questa stanza."
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr "Questa stanza non esiste."
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr "La creazione di stanze non è libera."
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr "È necessario usare il nickname registrato."
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 msgid "You are not in the members list."
 msgstr "Non appartieni alla lista dei membri."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4023,100 +4054,100 @@ msgstr ""
 "Il nickname desiderato è in uso o registrato da un altro partecipante.\n"
 "Specificare un altro nickname sotto:"
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Vorrei aggiungerti al mio roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "si è ora abbonati a %s"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "richiesta di cancellazione abbonamento da %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "è stato ora cancellato l'abbonamento a %s"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Per continuare a mandare e ricevere messaggi, è necessario riconnettersi."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Non ci si è potuti collegare a \"%s\""
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Connesso al server %s:%s con %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Controllare la connessione o riprovare più tardi"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autenticazione con \"%s\" fallita"
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Verificare la correttezza di login e password."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "Non è stata impostata la passphrase OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ci si connetterà a %s senza OpenPGP"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "invisibile"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "Sono %s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4125,18 +4156,18 @@ msgstr ""
 "Oggetto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Le informazioni di registrazione per il transport %s non sono arrivate in "
 "tempo"
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr "È avvenuto un errore di protocollo:"
 
@@ -4359,6 +4390,28 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "errore: impossibile aprire %s per lettura"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Nuovo messaggio come %s"
+
+#~ msgid "Chat with"
+#~ msgstr "Chatta con"
+
+#~ msgid "E-Mail"
+#~ msgstr "E-Mail"
+
+#~ msgid "Send New Message"
+#~ msgstr "Invia nuovo messaggio"
+
+#~ msgid "as %s"
+#~ msgstr "come %s"
+
+#~ msgid "as "
+#~ msgstr "come "
+
 #~ msgid "Send _New Message"
 #~ msgstr "Invia _nuovo messaggio"
 
diff --git a/po/nb/LC_MESSAGES/gajim.po b/po/nb/LC_MESSAGES/gajim.po
index 0b758bb06..95df9ca3f 100644
--- a/po/nb/LC_MESSAGES/gajim.po
+++ b/po/nb/LC_MESSAGES/gajim.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-08-15 08:30+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "En GTK jabber klient"
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -53,39 +53,40 @@ msgstr "Ingen"
 msgid "Hidden"
 msgstr "Mellomnavn:"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Samtale"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Gruppe Samtale"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "konto:"
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "ikke i kontaktliste"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Endre til %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -101,163 +102,165 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord funksjonen vil ikke bli brukt."
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Hvert %s _minutt"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Lyd"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "status melding tekst"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 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."
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan ikke endre din personlige informasjon uten å være tilkoblet."
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkkel."
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Passord setning"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Server"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Bilde"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "Bilde er for stort"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -265,65 +268,65 @@ msgstr ""
 "Bilde for uttrykksikon må være mindre enn eller lik 24 piksler i bredde og "
 "24 i høyde."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Nytt Rom"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 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."
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 #, fuzzy
 msgid "Invalid username"
 msgstr "Ugyldig bruker navn"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 #, fuzzy
 msgid "You must provide a username to configure this account."
 msgstr "Du må skrive inn et brukernavn for å legge til en konto"
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Du må skrive inn et passord for den nye kontoen"
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 #, fuzzy
 msgid "Account has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
@@ -333,20 +336,20 @@ msgstr ""
 "Du kan endre avanserte instillinger under valget \"Rediger->Kontoer\" fra "
 "hoved vinduet."
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 #, fuzzy
 msgid "Your new account has been created successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
@@ -390,13 +393,14 @@ msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
@@ -496,27 +500,26 @@ msgstr "Abbonerings ønske fra %s"
 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."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Bli med i Gruppesamtale som %s"
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Ny Melding som %s"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "for kontoen %s"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Ny Melding"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "_Start Samtale"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -525,130 +528,135 @@ msgstr ""
 "å sende en melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Tilbkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Ny Melding"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Ny Enkelt Melding"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 #, fuzzy
 msgid "New Private Message"
 msgstr "_Send Privat Melding"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, fuzzy, python-format
 msgid "From %s in room %s"
 msgstr "%s er nå %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "Fra %s"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "Til %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Enkel Melding som %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Enkel Melding"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, fuzzy, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Du har blitt invitert til %s rommet av %s"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -712,7 +720,7 @@ msgstr ""
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "_Rediger"
 
@@ -733,7 +741,7 @@ msgstr "Bruker ID:"
 msgid "Description"
 msgstr "Beskrivelse: %s"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -785,7 +793,7 @@ msgstr "Lagret i: %s"
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Åpne Foreldre Katalog"
 
@@ -893,7 +901,7 @@ msgstr "Avsender: "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Fortsett"
 
@@ -1201,8 +1209,8 @@ msgstr "Godtar du denne forespørselen?"
 msgid "error while sending"
 msgstr "feil ved sending"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Generelle"
 
@@ -1230,32 +1238,32 @@ msgstr "Du vil alltid se han/henne som frakoblet."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 #, fuzzy
 msgid "Your personal information has been published successfully."
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1263,12 +1271,12 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 #, fuzzy
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine instillinger"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
@@ -1582,7 +1590,7 @@ msgstr "Beskrivelse: %s"
 
 #: ../src/gtkgui.glade.h:11
 #, fuzzy
-msgid "<b>Format of a Chat Line</b>"
+msgid "<b>Format of a line</b>"
 msgstr "<b>Utseende på en samtale linje</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1815,47 +1823,47 @@ msgid "Bold"
 msgstr "Fet"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "K_oble til når Gajim starter"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Avbryt filoverføring"
 
-#: ../src/gtkgui.glade.h:74
-msgid "Cancels the selected file transfer"
-msgstr "Avbryter valgte filoverføring"
-
 #: ../src/gtkgui.glade.h:75
-#, fuzzy
-msgid "Cancels the selected file transfer and removes incomplete file"
+msgid "Cancels the selected file transfer"
 msgstr "Avbryter valgte filoverføring"
 
 #: ../src/gtkgui.glade.h:76
 #, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr "Avbryter valgte filoverføring"
+
+#: ../src/gtkgui.glade.h:77
+#, fuzzy
 msgid "Chan_ge Password"
 msgstr "Endre Passord"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Endre Passord"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Endre _Kallenavn"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Endre _Tema"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Samtale status opp_lysninger:"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Samtale bredde"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Sjekk etter ny _versjon når Gajim starter"
@@ -1990,106 +1998,102 @@ msgid "Display status messages of contacts in roster"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "E-Post"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "E-Post:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Rediger Grupper"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "Rediger Personlig Informasjon..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Slå på"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Skriv inn en gang til for verifisering:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Skriv inn nytt passord:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Hvert 5 _minutt"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Ekstra Adresse:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Etternavn:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Fil Overføringer"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "Fil _Overføringer"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Fil behandler:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 #, fuzzy
 msgid "Font style:"
 msgstr "Font:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Font:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Fra:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 #, fuzzy
 msgid "G_o"
 msgstr "Gå"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Gajim Tema Valg"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2099,7 +2103,7 @@ msgstr ""
 "informasjon relatert til samtalen du kan ha med en kontakt, som for eksemel "
 "skriving av en melding"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2107,7 +2111,7 @@ msgstr ""
 "Gajim vil autmatisk vise deg den nye meldingen i et samtalevindu eller fane "
 "i det eksisterende samtalevinduet"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2115,7 +2119,7 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at du har fått en ny melding"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2123,7 +2127,7 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget inn"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2131,83 +2135,83 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget ut"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajimvil bare endre ikonet til kontakten som har sendt den nye meldingen"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 #, fuzzy
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Første Gangs Veiviser"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Fornavn:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "HTTP Connect"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Lukker vinduet"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Hjemmeside:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Maskinnavn:"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "Jeg har allerede en konto jeg ønsker å bruke"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Jeg ønsker å _registrere en ny konto"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Dersom valgt vil Gajim automatisk gå inn i gruppesamtalen ved oppstart"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Dersom valgt vil Gajim huske passordet for kontoen"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2215,7 +2219,7 @@ msgstr ""
 "Dersom valgt vil Gajim huske kontaktliste og samtalevindu posisjoner på "
 "skjermen, samt størrelsen på de til neste gang du åpner de"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2223,7 +2227,7 @@ msgstr ""
 "Dersom valgt vil Gajim bytte ut \"smilies\" som ':)' med grafiske "
 "uttrykksikoner"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2231,7 +2235,7 @@ msgstr ""
 "Dersom valgt vil Gajim sende hold-i-live pakker så man ikke får en "
 "frakobling på grunn av inaktivitet"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 #, fuzzy
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -2240,7 +2244,7 @@ msgstr ""
 "Dersom valgt vil Gajim lagre passord i ~/.gajim/ konfigurasjonen med 'les' "
 "rettighet bare for deg og administratoren"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2249,7 +2253,7 @@ msgstr ""
 "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN "
 "vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2257,14 +2261,14 @@ msgstr ""
 "Dersom valgt, vil Gajim automatisk koble seg til jabber med denne kontoen "
 "ved oppstart"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2272,181 +2276,181 @@ msgstr ""
 "Dersom du har 2 eller flere kontoer og denne er valgt, vil Gajim liste alle "
 "kontakter som om du hadde en konto"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Innkommende melding:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Informasjon/Spørring"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 #, fuzzy
 msgid "Information about you, as stored in the server"
 msgstr "Informasjon om deg er lagret på serveren som vCard"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "Bli med i _Gruppe Samtale"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Plassering"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Logg historikk"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Behandle Kontoer"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Behandle Bokmerker"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Behandle Uttrykksikoner"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Behandle Proxy Profiler"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Behandle..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Mellomnavn:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "Mod_ererer"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Mer"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Ny versjon av Gajim tilgjengelig"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Alarmer meg om kontakter som:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "På hver _melding"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Åpne Nedlastings Side"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Åpne..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Kryptering"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "Eller velg en forhåndsvalgt melding:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Utgående melding:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 #, fuzzy
 msgid "Personal Information"
 msgstr "Rediger Personlig Informasjon..."
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Telefon Nummer:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Port:"
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Plassering:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "Post Kode:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Tittel:"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Utskrifts tid:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "Priorit_et:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2456,18 +2460,22 @@ msgstr ""
 "jabber serveren når to eller flere klienter er tilkoblet med samme konto. "
 "Klienten med den høyeste prioriteten vil få hendelsen"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Profil, Bilde"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Proxy:"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Nylig:"
@@ -2565,105 +2573,105 @@ msgid "Send File"
 msgstr "Send Fil"
 
 #: ../src/gtkgui.glade.h:246
-#, fuzzy
-msgid "Send New Message"
-msgstr "Ny Melding"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Send Enkel _Melding"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "Send _Fil"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 #, fuzzy
 msgid "Send _New Message..."
 msgstr "_Ny Melding..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Send hold-i-live meldinger"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Send melding"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Send melding og lukk vinduet"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr "Sender en melding til tilkoblede brukere på denne serveren"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Server Funksjonalitet"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Velg MFD (MOTD)"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Velg Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Velg _Avatar"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Setter Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "Vi _Frakoblede Kontakter"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Show _Roster"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "_XML Konsoll"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Viser en liste over overføringer mellom deg og andre"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Status"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Start _Samtale"
@@ -2672,7 +2680,7 @@ msgstr "Start _Samtale"
 msgid "State:"
 msgstr "Fylke:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Status"
 
@@ -2842,338 +2850,344 @@ msgstr ""
 msgid "Your JID:"
 msgstr "Din JID:"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Handlinger"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "_Legg til Kontakt..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "_Legg til Kontaktliste"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "_Avansert"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Godkjenn"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid "_Background:"
 msgstr "Bakgrunns farge"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "_Utvis"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "Lag _Bokmerke til Rommet"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "_Kompakt Utseende    Alt+C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 #, fuzzy
 msgid "_Contents"
 msgstr "_Fortsett"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "_Kopier JID/E-post Adresse"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Kopier Link PLassering"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "_Nekt"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Group Chat"
 msgstr "Gruppe Samtale"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_Historie"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Maskin:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Ikon i systray (aka. notification area)"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 #, fuzzy
 msgid "_Join New Room..."
 msgstr "Nytt Rom"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "_Kast ut"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "_Slå sammen kontoer"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "_Endre"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 #, fuzzy
 msgid "_Modify Account..."
 msgstr "_Rediger Konto..."
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Navn:"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Aldri"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "_Gi meg beskjed om det"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Gi meg beskjed når filoverføring er komplett"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "_Beboer Handling"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "_Online Brukere"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Åpne ny Epost"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "_Åpne Link i Nettleser"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "_Eier"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Spiller:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "_Sprett opp"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Instillinger"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Publisér"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "_Fjern fra Kontaktliste"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "_Svar"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Hent"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "_Send"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "_Send & Lukk"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "_Send Privat Melding"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "_Send Server Melding"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "_Send Enkel Melding"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "_Velg Bilde..."
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Abbonér"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Abonement"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Bruk proxy"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "_Brukernavn:"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Stemme"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "_XML Konsoll..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "fil overførings liste"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "minutter"
 
@@ -3198,27 +3212,41 @@ msgstr ""
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Fylke:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Melding"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Samtale Historikk med %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%s er nå %s (%s)"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nå: %s: %s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %s: %s"
@@ -3288,7 +3316,7 @@ msgstr "_Slå sammen kontoer"
 msgid "You are already in room %s"
 msgstr "Du er allerede i rom %s"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 #, fuzzy
 msgid "You cannot join a room while you are invisible"
 msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
@@ -3312,97 +3340,97 @@ msgstr "til %s kontoen"
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "som %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s er nå %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra %s"
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 #, fuzzy
 msgid "Re_name"
 msgstr "Gi nytt navn"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "_Logg på"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "Logg _av"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 #, fuzzy
 msgid "_Change Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "Abbonerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Dersom \"%s\" aksepterer denne forespørselen vil du kunne hans status."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Du vil alltid se han/henne som frakoblet."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -3411,59 +3439,59 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen. Kontakten \"%s\" "
 "vil alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Skriv OpenPGP nøkkel passordsetning for konto %s"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Lagre passordsetning"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 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."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3471,7 +3499,7 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 #, fuzzy
 msgid "Change Status Message..."
 msgstr "%s Status Melding"
@@ -3483,16 +3511,17 @@ msgstr "%s Status Melding"
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "som"
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "konto:"
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 #, fuzzy
 msgid "Hide this menu"
 msgstr "Lukker vinduet"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr "Alle kontakter in denne gruppen er frakoblet eller har feil"
 
@@ -3533,29 +3562,29 @@ msgstr ""
 "borte."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Du er ikke lenger i rommet \"%s\" eller \"%s\" har dratt."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Kryptering påslått"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Kryptering avslått"
 
@@ -3867,227 +3896,227 @@ msgid ""
 "his or her status and/or his status message."
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Jeg er ute og lever livet"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 #, fuzzy
 msgid "marine"
 msgstr "minutter"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr ""
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr ""
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 #, fuzzy
 msgid "You are banned from this room."
 msgstr "Du er allerede i rom %s"
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr ""
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr ""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abbonerer nå på %s"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abbonerer ikke lenger på %s"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "For å sende og motta meldinger må du koble til på nytt."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, fuzzy, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Tilkoblet til server med %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passordsetning ble ikke gitt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du vil bli tilbkoblet til %s uten OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "usynlig"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "Jeg er %s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Denne meldingen er kryptert]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4096,17 +4125,17 @@ msgstr ""
 "Tittel: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 #, fuzzy
 msgid "Timeout"
 msgstr "Tema"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr ""
 
@@ -4336,6 +4365,29 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Ny Melding som %s"
+
+#~ msgid "Chat with"
+#~ msgstr "Samtale bredde"
+
+#~ msgid "E-Mail"
+#~ msgstr "E-Post"
+
+#, fuzzy
+#~ msgid "Send New Message"
+#~ msgstr "Ny Melding"
+
+#~ msgid "as %s"
+#~ msgstr "som %s"
+
+#~ msgid "as "
+#~ msgstr "som"
+
 #, fuzzy
 #~ msgid "Send _New Message"
 #~ msgstr "_Ny Melding"
diff --git a/po/nl/LC_MESSAGES/gajim.po b/po/nl/LC_MESSAGES/gajim.po
index b58e31f21..8f88cd71f 100644
--- a/po/nl/LC_MESSAGES/gajim.po
+++ b/po/nl/LC_MESSAGES/gajim.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-09-01 20:31+0200\n"
 "Last-Translator: Stéphan Kochen <stephan@kochen.nl>\n"
 "Language-Team: none\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Een GTK jabber client"
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -55,39 +55,40 @@ msgstr "Geen"
 msgid "Hidden"
 msgstr "Middelste naam:"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Gesprek"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Groupsgesprek"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "account: "
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "niet in het rooster"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Schakel over naar %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -103,167 +104,169 @@ msgstr ""
 "\n"
 "De markering van spelfouten zal niet worden gebruikt."
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Elke %s _minuten"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Actief"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Geluid"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "titel statusbericht"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "statusbericht"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Kies Geluid"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Wav Geluiden"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Je bent momenteel verbonden met de server"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Ongeldige account naam"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Account naam kan niet leeg zijn."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Account naam mag geen spaties bevatten."
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Een Jabber ID moet in de vorm \"gebruiker@servernaam\" zijn."
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Account bestaat niet"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Je moet een account aanmaken voordat persoonlijke informatie kan worden "
 "aangepast."
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Zonder verbinding is het niet mogelijk persoonlijke informatie aan te passen."
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Kon de geheime sleutel niet ophalen"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Er trad een probleem op bij het ophalen van je geheime OpenPGP sleutels."
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Wachtwoord"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Kies je OpenPGP sleutel"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Geen sleutel geselecteerd"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Server"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Transporten"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "Wijzig %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "Registreer met %s"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Afbeelding"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "Afbeelding is te groot"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -271,67 +274,67 @@ msgstr ""
 "Afbeelding voor emoticon moet kleiner dan 24 pixels breed en 24 pixels hoog "
 "zijn."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Kies Afbeelding"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Als je het verwijdert, wordt de verbinding verbroken."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Nieuwe Ruimte"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Deze bladwijzer bevat ongeldige informatie"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Zorg ervoor dat de server- en ruimtevelden ingevuld zijn, of verwijder deze "
 "bladwijzer."
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 #, fuzzy
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 #, fuzzy
 msgid "You must provide a username to configure this account."
 msgstr "Je moet een gebruikersnaam invullen om een account toe te voegen."
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Je moet een wachtwoord invullen voor de nieuwe account"
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 #, fuzzy
 msgid "Account has been added successfully"
 msgstr "Bladwijzer is met succes toegevoegd"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
@@ -341,20 +344,20 @@ msgstr ""
 "Geavanceerde opties zijn in te stellen via \"Bewerken->Accounts\" vanaf het "
 "hoofdvenster."
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 #, fuzzy
 msgid "Your new account has been created successfully"
 msgstr "Bladwijzer is met succes toegevoegd"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
 
@@ -399,13 +402,14 @@ msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
@@ -508,27 +512,26 @@ msgstr ""
 "Het is niet mogelijk aan een groepsgesprek deel te nemen zonder verbonden te "
 "zijn."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Neem deel aan Groepsgesprek als %s"
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Nieuw Bericht als %s"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "voor account %s"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Nieuw Bericht"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "_Start Gesprek"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -537,130 +540,135 @@ msgstr ""
 "worden:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Zorg ervoor dat je verbinding hebt met \"%s\"."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Je moet een wachtwoord opgeven."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "De wachtwoorden in beide velden moeten identiek zijn"
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Nieuw Bericht"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Nieuw Enkel Bericht"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 #, fuzzy
 msgid "New Private Message"
 msgstr "Ver_stuur Privé Bericht"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, fuzzy, python-format
 msgid "From %s in room %s"
 msgstr "%s is nu %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "Van %s"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Bestandsoverdracht Verzoek"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Bestandsoverdracht Fout"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Bestandsoverdracht Voltooid"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht Gestopt"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "Aan %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Enkel Bericht als %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Enkel Bericht"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Stuur %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "Ontvangen %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console voor %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "XML Console"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, fuzzy, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Je bent uitgenodigd naar ruimte %s te komen door %s"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
@@ -725,7 +733,7 @@ msgstr ""
 msgid "Re_gister"
 msgstr "Re_gistreer"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "Be_werken"
 
@@ -746,7 +754,7 @@ msgstr "Gebruikers ID:"
 msgid "Description"
 msgstr "Beschrijving: %s"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Binnengaan"
 
@@ -798,7 +806,7 @@ msgstr "Opgeslagen in: %s"
 msgid "File transfer completed"
 msgstr "Bestandsoverdracht afgerond"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Open Bovenliggende Map"
 
@@ -906,7 +914,7 @@ msgstr "Afzender: "
 msgid "Pause"
 msgstr "Pauze"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Verder"
 
@@ -1217,8 +1225,8 @@ msgstr "Neem je dit verzoek aan?"
 msgid "error while sending"
 msgstr "fout tijdens versturen"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Algemeen"
 
@@ -1246,32 +1254,32 @@ msgstr "Je zult hem altijd offline zien."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kan geen contact maken met \"%s\""
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Controleer de verbinding of probeer later nogmaals."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "Je wachtwoord is incorrect"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 #, fuzzy
 msgid "Your personal information has been published successfully."
 msgstr "Bladwijzer is met succes toegevoegd"
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1279,12 +1287,12 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 #, fuzzy
 msgid "Could not save your settings and preferences"
 msgstr "Kan instellingen niet opslaan"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
@@ -1600,7 +1608,7 @@ msgstr "Beschrijving: %s"
 
 #: ../src/gtkgui.glade.h:11
 #, fuzzy
-msgid "<b>Format of a Chat Line</b>"
+msgid "<b>Format of a line</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1837,47 +1845,47 @@ msgid "Bold"
 msgstr "Vetgedrukt"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "Automatisch _verbinding maken als Gajim opstart"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Bestandsoverdracht annuleren"
 
-#: ../src/gtkgui.glade.h:74
-msgid "Cancels the selected file transfer"
-msgstr "Annuleert de geselecteerde bestandsoverdracht"
-
 #: ../src/gtkgui.glade.h:75
-#, fuzzy
-msgid "Cancels the selected file transfer and removes incomplete file"
+msgid "Cancels the selected file transfer"
 msgstr "Annuleert de geselecteerde bestandsoverdracht"
 
 #: ../src/gtkgui.glade.h:76
 #, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr "Annuleert de geselecteerde bestandsoverdracht"
+
+#: ../src/gtkgui.glade.h:77
+#, fuzzy
 msgid "Chan_ge Password"
 msgstr "Verander Wachtwoord"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Verander Wachtwoord"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Verander Bij_naam"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Verander _Onderwerp"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Praat met"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Controleer of een nieuwe _versie beschikbaar is als Gajim opstart"
@@ -2011,106 +2019,102 @@ msgid "Display status messages of contacts in roster"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Wijzig Groepen"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "Wijzig Persoonlijke Informatie..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Wijzig _Groepen"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Geef opnieuw op ter bevestiging:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Geef nieuw wachtwoord op:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Gebeurtenissen"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Elke 5 _minuten"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Extra Adres:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Familie:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Bestandsoverdrachten"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "Bestands_overdrachten"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Bestandsbeheerder:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 #, fuzzy
 msgid "Font style:"
 msgstr "Lettertype:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Lettertype:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formaat: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Van:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 #, fuzzy
 msgid "G_o"
 msgstr "Ga"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Gajim Themas Aanpassen"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2120,7 +2124,7 @@ msgstr ""
 "informatie te verzenden gerelateerd aan gesprekken, bijv. dat je een bericht "
 "aan het typen bent"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2128,14 +2132,14 @@ msgstr ""
 "Gajim zal automatisch nieuwe berichten in een nieuw venster of tab in een "
 "bestaand venster laten zien"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
 msgstr ""
 "Gajim zal nieuwe berichten mededelen m.b.v. een popup rechtsonder in beeld"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2143,7 +2147,7 @@ msgstr ""
 "Gajim zal contacten die zich aanmelden mededelen m.b.v. een popup "
 "rechtsonder in beeld"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2151,86 +2155,86 @@ msgstr ""
 "Gajim zal contacten die zich afmelden mededelen m.b.v. een popup rechtsonder "
 "in beeld"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim zal alleen het contacticoon veranderen bij nieuwe berichten"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 #, fuzzy
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Eerste Keer Assistent"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Voornaam:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Groep:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "HTTP Verbinden"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Verbergt het venster"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Hostnaam: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "Ik heb al een account die ik wil gebruiken"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Ik wil een nieuwe account _registreren"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Ik wil je graag toevoegen aan mijn contactlijst"
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr ""
 "Indien aangevinkt zal Gajim een icoon in het mededelingengebied (systray) "
 "weergeven"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr ""
 "Indien aangevinkt zal Gajim zich automatisch aanmelden bij dit groepsgesprek "
 "tijdens het opstarten"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Indien aangevinkt zal Gajim het wachtwoord onthouden voor deze account"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2238,7 +2242,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim de positie en grootte van vensters onthouden "
 "voor de volgende keer dat ze geopend worden"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2246,7 +2250,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim tekst smilies, zoals ':)', vervangen met "
 "bijpassende grafische emoticons"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2254,7 +2258,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim keep-alive-paketten sturen om de verbinding in "
 "stand te houden"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 #, fuzzy
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -2263,7 +2267,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim wachtwoorden opslaan in ~/.gajim/config met "
 "alleen lees permissies voor jou en administratoren"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2273,7 +2277,7 @@ msgstr ""
 "(Bijv. contacten van MSN zullen met msn iconen weergegeven worden voor "
 "status online, afwezig, bezig, enz...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2281,14 +2285,14 @@ msgstr ""
 "Indien aangevinkt zal Gajim automatisch verbinding maken met deze account "
 "bij het opstarten"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2296,181 +2300,181 @@ msgstr ""
 "Indien aangevinkt en je twee of meer accounts hebt, zal Gajim de contacten "
 "van alle accounts samenvoegen alsof ze een grote account zijn."
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Binnenkomend bericht:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Info/Vraag (Info/Query)"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 #, fuzzy
 msgid "Information about you, as stored in the server"
 msgstr "Je informatie wordt opgeslagen op de server als een vCard"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Schuingedrukt"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "Neem deel aan _Groepsgesprek"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Locatie"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Logboek"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Beheer Accounts"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Beheer Bladwijzers"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Beheer Emoticons"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Beheer Proxy Profielen"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Beheer..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Middelste naam:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "_Beheerder"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Meer"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Naam:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Nieuwe versie van Gajim beschikbaar"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Bijnaam:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Geen"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Geef mij bericht over contacten die: "
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "Besturingssysteem:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "Bij elk _bericht"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Open Download Pagina"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Open..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "Of kies een vooraf ingesteld bericht:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Uitgaand bericht:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "_Wachtwoord:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 #, fuzzy
 msgid "Personal Information"
 msgstr "Wijzig Persoonlijke Informatie..."
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Telefoonnummer:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "Speel _geluiden af"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Poort: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Positie:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "Postcode:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Voorkeuren"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Voorvoegsel:"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Print tijd:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "Priori_teit"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2480,18 +2484,22 @@ msgstr ""
 "ontvangt als er twee keer op dezelfde account ingelogd is; de hoogste  "
 "prioriteit wint."
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Profiel, Contactafbeelding"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Proxy:"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Recent:"
@@ -2591,105 +2599,105 @@ msgid "Send File"
 msgstr "Bestand Verzenden"
 
 #: ../src/gtkgui.glade.h:246
-#, fuzzy
-msgid "Send New Message"
-msgstr "Nieuw Bericht"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Enkel _Bericht Verzenden"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "_Bestand Verzenden"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 #, fuzzy
 msgid "Send _New Message..."
 msgstr "_Nieuw Bericht..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Keep-alive-pakketten verzenden"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Bericht verzenden"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr "Stuurt een bericht naar gebruikers momenteel verbonden met deze server"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Server Mogelijkheden"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Stel MOTD in"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Stel Bericht van de Dag in"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Stel Contact_afbeelding in"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Stelt het Bericht van de Dag in"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "_Offline Contacten Weergeven"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Show _Roster"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "_XML Console"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Laat een lijst met bestandsoverdrachten zien tussen jou en ander"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "_Inloggen"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "_Uitloggen"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Sorteer contacten op status"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Status"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Start _Gesprek"
@@ -2698,7 +2706,7 @@ msgstr "Start _Gesprek"
 msgid "State:"
 msgstr "Staat:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Status"
 
@@ -2868,338 +2876,344 @@ msgstr ""
 msgid "Your JID:"
 msgstr "Jouw JID:"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Acties"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "_Contact Toevoegen..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "_Toevoegen aan Roster"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "Gea_vanceerd"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Toestemmen"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid "_Background:"
 msgstr "Achtergrond kleur"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "Ver_bannen"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "Maak _Bladwijzer Voor Deze Ruimte"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_Annulerem"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "_Compacte Weergave    Alt+C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 #, fuzzy
 msgid "_Contents"
 msgstr "_Verder"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "_Kopieer JID/Email Adres"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Kopieer Link Lokatie"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "_Weigeren"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Afronden"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "Verkeerd gespelde woorden _markeren"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_Geschiedenis"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Host:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Icoon in mededelingsgebied"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 #, fuzzy
 msgid "_Join New Room..."
 msgstr "Nieuwe Ruimte"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "Uit_schoppen"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "_Mail client:"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Lid"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "Accounts _samenvoegen"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Bericht"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "Be_werk"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 #, fuzzy
 msgid "_Modify Account..."
 msgstr "Account Be_werken..."
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Naam: "
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Nooit"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "_Stel mij ervan op de hoogte"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Stel mij op de hoogte als een bestandsoverdracht voltooid is"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "_Bezitter Acties"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "_Online Gebruikers"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Open Email Samensteller"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "_Eigenaar"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Pauze"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Speler:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "_Opduiken"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Poort:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Voorkeuren"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Aanwezigheid"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Publiceren"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "A_fsluiten"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "_Verwijder"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "_Verwijder van Rooster"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "_Hernoem"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "Be_antwoord"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Haal op"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "Ver_stuur"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "Ver_stuur & Sluit"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "Ver_stuur Privé Bericht"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "Ver_stuur Server Bericht"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "Ver_stuur Enkel Bericht"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "_Stel Afbeelding in..."
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "_Start Gesprek"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Abonneer"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Abonnement"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Gebruik proxy"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "_Gebruikersnaam:"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Stem"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "_XML Console..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "bestandsoverdrachtlijst"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "minuten"
 
@@ -3224,27 +3238,41 @@ msgstr ""
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Staat:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Bericht"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Gespreksgeschiedenis van %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%s is nu %s (%s)"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is nu: %s: %s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is nu: %s: %s"
@@ -3314,7 +3342,7 @@ msgstr "Accounts _samenvoegen"
 msgid "You are already in room %s"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 #, fuzzy
 msgid "You cannot join a room while you are invisible"
 msgstr ""
@@ -3340,27 +3368,27 @@ msgstr "aan %s account"
 msgid "using %s account"
 msgstr "via %s account"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "als %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "voor account %s"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s is nu %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -3369,70 +3397,70 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten van %s"
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "Wijs een OpenPGP sleutel toe"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Selecteer een sleutel om aan de contact toe te wijzen"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Ik zou je graag aan mijn rooster toe willen voegen"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 #, fuzzy
 msgid "Re_name"
 msgstr "Hernoem"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "_Log in"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "Log _uit"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 #, fuzzy
 msgid "_Change Status Message"
 msgstr "%s Statusbericht"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "Machtiging is verzonden"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" zal nu je status ontvangen."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Als \"%s\" dit verzoek aanneemt zal je zijn status kunnen ontvangen."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Machtiging is verzonden"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Je zult hem altijd offline zien."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -3441,61 +3469,61 @@ msgstr ""
 "Door deze contact te verwijderen zal je ook zijn toestemming opzeggen om jou "
 "status te zien. Contact \"%s\" zal jou altijd als offline zien."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geef je wachtwoord op voor account %s"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Sla wachtwoord op"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Sla wachtwoord op"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3503,7 +3531,7 @@ msgstr ""
 "Berichten zullen alleen voor later beschikbaar zijn als de geschiedenis "
 "ingeschakeld is."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 #, fuzzy
 msgid "Change Status Message..."
 msgstr "%s Statusbericht"
@@ -3515,16 +3543,17 @@ msgstr "%s Statusbericht"
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "als "
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "account: "
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 #, fuzzy
 msgid "Hide this menu"
 msgstr "Verbergt het venster"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr "Alle contacten in deze groep zijn offline of hebben fouten"
 
@@ -3566,29 +3595,29 @@ msgstr ""
 "verloren gaan."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Je bericht kan niet worden verzonden totdat je verbinding hebt."
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Sturen van privé bericht mislukt"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Je bent niet meer in ruimte \"%s\" of \"%s\" heeft de ruimte verlaten."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Versleuteling ingeschakeld"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
@@ -3902,229 +3931,229 @@ msgid ""
 "his or her status and/or his status message."
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Slapen"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Zo terug"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "In een paar minuten terug."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Eten"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Ik ben aan het eten, laat een bericht achter."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Ik been een film aan het kijken."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Werken"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Ik ben aan het werk."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Ik ben aan het telefoneren."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Uit"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Ik ben uit van het leven genieten"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 #, fuzzy
 msgid "marine"
 msgstr "minuten"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr ""
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr ""
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 #, fuzzy
 msgid "You are banned from this room."
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr ""
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr ""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we zijn nu op %s geabonneert"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "afmelding verzocht van %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we zijn nu van %s afgemeld"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Om verdere berichten te versturen en ontvangen, moet je de verbinding "
 "opnieuw in stand brengen."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, fuzzy, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Verbonden met server met %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Controleer je verbinding of probeer later nogmaals"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggen mislukt met \"%s\""
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Controleer gebruikersnaam en wachtwoord."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP wachtwoord niet opgegeven"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Je zult verbonden worden met %s zonder OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "onzichtbaar"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "Ik ben %s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4133,17 +4162,17 @@ msgstr ""
 "Onderwerp: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 #, fuzzy
 msgid "Timeout"
 msgstr "Thema"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr ""
 
@@ -4373,6 +4402,29 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "fout: kan %s niet voor lezen openen"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Nieuw Bericht als %s"
+
+#~ msgid "Chat with"
+#~ msgstr "Praat met"
+
+#~ msgid "E-Mail"
+#~ msgstr "E-Mail"
+
+#, fuzzy
+#~ msgid "Send New Message"
+#~ msgstr "Nieuw Bericht"
+
+#~ msgid "as %s"
+#~ msgstr "als %s"
+
+#~ msgid "as "
+#~ msgstr "als "
+
 #, fuzzy
 #~ msgid "Send _New Message"
 #~ msgstr "_Nieuw Bericht"
diff --git a/po/pl/LC_MESSAGES/gajim.po b/po/pl/LC_MESSAGES/gajim.po
index 14bfb06f0..a18bc504d 100644
--- a/po/pl/LC_MESSAGES/gajim.po
+++ b/po/pl/LC_MESSAGES/gajim.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-09-07 13:48+0200\n"
 "Last-Translator: Witek Kieraś <pambuk@gmail.com>\n"
 "Language-Team: none\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Klient jabbera w GTK."
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -56,39 +56,40 @@ msgstr "Żaden"
 msgid "Hidden"
 msgstr "Drugie imię:"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Rozmowa"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Pokój"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "konto: "
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "spoza listy kontaktów"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Zmień na %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -104,164 +105,166 @@ msgstr ""
 "\n"
 "Podświedlanie błędów w pisowni nie będzie używane"
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Co %s _minut(y)"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr "Musisz najpierw stworzyć konto by móc edytować informacje o sobie."
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Musisz być połączony, aby móc zmieniać informacje o sobie."
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Hasło"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Nie wybrano żadnego klucza"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Serwer"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Obrazek"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "Obrazek jest za duży"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -269,65 +272,65 @@ msgstr ""
 "Obrazek emotikony musi mieć rozmiar mniejszy lub równy 24 pikselom długości "
 "i 24 pikselom szerokości"
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Nowy pokój"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Upewnij się, że wypełniłeś pola serwer i pokój lub usuń tę zakładkę."
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 #, fuzzy
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika."
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 #, fuzzy
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby dodać konto."
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Musisz wpisać hasło dla nowego konta."
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 #, fuzzy
 msgid "Account has been added successfully"
 msgstr "Zakładka została dodana"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
@@ -337,20 +340,20 @@ msgstr ""
 "Możesz ustawić opcje zaawansowane wybierając \"Modyfikuj->Konta\" w głównym "
 "oknie programu."
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 #, fuzzy
 msgid "Your new account has been created successfully"
 msgstr "Zakładka została dodana"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
@@ -394,13 +397,14 @@ msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
@@ -499,27 +503,26 @@ msgstr "Prośba o autoryzację od %s"
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nie możesz dołączyć do pokoju gdy nie jesteś połączony."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Dołącz do pokoju jako %s."
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Nowa wiadomość jako %s"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "dla konta %s"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Nowa wiadomość"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "_Rozpocznij rozmowę"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -528,130 +531,135 @@ msgstr ""
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Nie możesz zmienić hasła, jeśli nie jesteś połączony."
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się."
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Nowa wiadomość"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 #, fuzzy
 msgid "New Private Message"
 msgstr "_Wyślij prywatną wiadomość"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, fuzzy, python-format
 msgid "From %s in room %s"
 msgstr "%s ma teraz status %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "Od %s"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku."
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "Do %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Wyślij wiadomość jako %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "Odebrane %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "Konsola XML"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, fuzzy, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Otrzymałeś zaproszenie do pokoju %s od %s"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
@@ -715,7 +723,7 @@ msgstr ""
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "_Modyfikuj"
 
@@ -736,7 +744,7 @@ msgstr "Identyfikator użytkownika:"
 msgid "Description"
 msgstr "Opis: %s"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Dołącz"
 
@@ -788,7 +796,7 @@ msgstr "Zapisane w: %s"
 msgid "File transfer completed"
 msgstr "Zakończono przesyłanie pliku."
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Otwórz katalog zawierający ten plik."
 
@@ -896,7 +904,7 @@ msgstr "Nadawca: "
 msgid "Pause"
 msgstr "Zatrzymaj"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Kontynuuj"
 
@@ -1206,8 +1214,8 @@ msgstr "Czy akceptujesz tę prośbę?"
 msgid "error while sending"
 msgstr "błąd przy wysyłaniu"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Ogólne"
 
@@ -1235,32 +1243,32 @@ msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Nie można ustanowić połączenia z \"%s\""
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Sprawdź swoje połączenie lub spróbuj później."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "Twoje hasło jest niepoprawne."
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 #, fuzzy
 msgid "Your personal information has been published successfully."
 msgstr "Zakładka została dodana"
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1268,12 +1276,12 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 #, fuzzy
 msgid "Could not save your settings and preferences"
 msgstr "Nie można zapisać twoich ustawień."
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
@@ -1591,7 +1599,7 @@ msgstr "Opis: %s"
 
 #: ../src/gtkgui.glade.h:11
 #, fuzzy
-msgid "<b>Format of a Chat Line</b>"
+msgid "<b>Format of a line</b>"
 msgstr "<b>Format linii rozmowy</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1825,47 +1833,47 @@ msgid "Bold"
 msgstr "Wytłuszczone"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "P_ołącz przy starcie programu"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Usuwa transfer pliku"
 
-#: ../src/gtkgui.glade.h:74
-msgid "Cancels the selected file transfer"
-msgstr "Usuwa wybrany transfer pliku"
-
 #: ../src/gtkgui.glade.h:75
-#, fuzzy
-msgid "Cancels the selected file transfer and removes incomplete file"
+msgid "Cancels the selected file transfer"
 msgstr "Usuwa wybrany transfer pliku"
 
 #: ../src/gtkgui.glade.h:76
 #, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr "Usuwa wybrany transfer pliku"
+
+#: ../src/gtkgui.glade.h:77
+#, fuzzy
 msgid "Chan_ge Password"
 msgstr "Zmień hasło"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Zmień hasło"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Zmień pseudo_nim"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Zmień _temat"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Powiadomienia o stanie _rozmowy:"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Rozmowa z"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Przy starcie sprawdzaj czy są dostępne nowe _wersje"
@@ -2001,106 +2009,102 @@ msgid "Display status messages of contacts in roster"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "Adres e-mail"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "Adres e-mail:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Edytuj Grupy"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "Zmień informacje o sobie..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Modyfikuj _grupy"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Włącz"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Wpisz ponownie nowe hasło:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Wpisz nowe hasło:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Zdarzenia"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Co 5 _minut"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Dodatkowy adres:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Nazwisko:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Przesyłane pliki."
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Przesyłanie plików"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Menadżer plików:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtr:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 #, fuzzy
 msgid "Font style:"
 msgstr "Czcionka:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Czcionka:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: RRRR-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 #, fuzzy
 msgid "G_o"
 msgstr "Idź"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Wybieranie motywów dla Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2110,7 +2114,7 @@ msgstr ""
 "możliwości wysyłania i odbierania meta-informacji związanych z rozmową, "
 "którą prowadzisz z kontaktem, np. infomację o pisaniu wiadomości."
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2118,7 +2122,7 @@ msgstr ""
 "Gajim automatycznie wyświetli nową wiadomość w nowym oknie lub w nowej "
 "karcie otwartego okna rozmowy."
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2126,7 +2130,7 @@ msgstr ""
 "Gajim powiadomi Cię o nadejściu nowej wiadomości wyświetlając okienko w "
 "prawym dolnym rogu ekranu."
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2134,7 +2138,7 @@ msgstr ""
 "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
 "kontaktach, które zmieniają status na Dostępny."
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2142,82 +2146,82 @@ msgstr ""
 "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
 "kontaktach które zmieniają status na Rozłączony."
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim zmieni jedynie ikonę kontaktu, który przysłał nową wiadomość."
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 #, fuzzy
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Pierwsze uruchomienie programu"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Imię:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Grupa:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "Połączenie HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Ukrywa okno"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Strona domowa:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Nazwa hosta: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "Mam już konto i chcę z niego korzystać."
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Chcę za_rejestrować nowe konto Jabbera."
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Zaznaczenie spowoduje włączenie ikony Gajima w tacce systemowej."
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Zaznaczenie spowoduje łączenie z tym pokojem przy starcie programu"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Włączenie tej opcji spowoduje zapamiętanie hasła dla tego konta."
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2225,7 +2229,7 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje zapamiętanie położenia głównego okna "
 "programu na ekranie oraz jego rozmiaru."
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2233,7 +2237,7 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje zastąpienie emotikon tekstowych jak ':)' "
 "emotikonami graficznymi."
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2241,7 +2245,7 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje wysyłanie pakietów podtrzymujących "
 "połączenie, co zapobiega rozłączaniu."
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 #, fuzzy
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -2250,7 +2254,7 @@ msgstr ""
 "Zaznaczanie tej opcji spowoduje nadanie praw do odczytu pliku ~/.gajim/"
 "config tylko Tobie i oczywiście administratorowi."
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2260,7 +2264,7 @@ msgstr ""
 "transportu, np. kontakt z MSN będzie miał odpowiednie ikony statusu "
 "dostępny, zaraz wracam, zajęty, itd."
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2268,14 +2272,14 @@ msgstr ""
 "Zaznaczanie tej opcji spowoduje automatyczne łączenie z siecią Jabber z "
 "wykorzystaniem tego konta."
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2283,183 +2287,183 @@ msgstr ""
 "Jeśli masz dwa konta lub więcej, to dzięki tej opcji Gajim pokaże wszystkie "
 "kontakty w taki sposób, jakby było to jedno konto."
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Wiadomość otrzymana:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Informacje/Zapytanie"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 #, fuzzy
 msgid "Information about you, as stored in the server"
 msgstr ""
 "Informacje o Tobie są przechowywane na serwerze\n"
 "jako vCard."
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Kursywa"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "Dołącz do _pokoju"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Miejsce"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Historia"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Zarządzaj kontami"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Zarządzaj zakładkami"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Zarządzaj emotikonami"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Zarządzaj profilami pośrednika"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Zarządzaj..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Drugie imię:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Więcej"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Dostępna jest nowa wersja Gajima"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Pseudonim:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Żaden"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Powiadom mnie o kontaktach zmieniających status na: "
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "System operacyjny:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "W każdej _wiadomości"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Otwórz stronę pobierania"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Otwórz..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "Szyfrowanie OpenPGP"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "Albo wybierz opis zapisany:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Wiadomość wysłana:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "_Hasło:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 #, fuzzy
 msgid "Personal Information"
 msgstr "Zmień informacje o sobie..."
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Telefon:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "Odtwórz _dźwięk"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Stanowisko:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "Kod pocztowy:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Ustawienia"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Prefiks:"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Wyświetlaj czas:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "Priory_tet:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2469,18 +2473,22 @@ msgstr ""
 "serwera gdy dwa klienty (lub więcej) są połączone z tym samym kontem. Ten "
 "który ma wyższy priorytet, będzie odbierał wiadomości."
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Profil, Awatar"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Protokół:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Pośrednik:"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Ostatnio:"
@@ -2578,105 +2586,105 @@ msgid "Send File"
 msgstr "Wyślij plik"
 
 #: ../src/gtkgui.glade.h:246
-#, fuzzy
-msgid "Send New Message"
-msgstr "Nowa wiadomość"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Wyślij _wiadomość"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "Wyślij _plik"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 #, fuzzy
 msgid "Send _New Message..."
 msgstr "_Nowa wiadomość..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Wysyłaj pakiety podtrzymujące"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Wyślij wiadomość"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Wyślij wiadomość i zamknij okno"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr "Wyślij wiadomość do użytkowników aktualnie połączonych z tym serwerem"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Serwer:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Możliwości serwerów"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Ustaw MOTD"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Ustaw Wiadomość Dnia"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Ustaw _Awatar"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Ustawia Wiadomość Dnia"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "Pokaż kontakty niep_ołączone"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Show _Roster"
 msgstr "Pokaż tylko _listę kontaktów"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "Konsola _XML"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Pokaż tylko _listę kontaktów"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Pokaż listę przesłanych plików pomiędzy tobą a innymi"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "_Połączony"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "R_ozłączony"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Sortuj kontakty wydług statusu"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Status"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Rozpocznij _rozmowę"
@@ -2685,7 +2693,7 @@ msgstr "Rozpocznij _rozmowę"
 msgid "State:"
 msgstr "Stan/Województwo:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Status"
 
@@ -2855,338 +2863,344 @@ msgstr ""
 msgid "Your JID:"
 msgstr "Twój JID:"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "Dzi_ałania"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "Dod_aj kontakt..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "Dod_aj do listy kontaktów"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "Z_aawansowane"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Autoryzuj"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid "_Background:"
 msgstr "Kolor tła"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "Za_banuj"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "Dodaj _zakładkę dla tego pokoju"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "Prze_glądarka:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "Widok _zwarty    Alt+C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 #, fuzzy
 msgid "_Contents"
 msgstr "_Kontynuuj"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiuj JID/Adres e-mail"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Kopiuj adres odnośnika"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "O_dmów"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_Filter:"
 msgstr "Filtr:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Zakończ"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Group Chat"
 msgstr "Pokój"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "Podś_wietlaj błędy w pisowni"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_Historia"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Host:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Ikona w tacce systemowej"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoruj wiadomości od osób spoza listy kontaktów"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 #, fuzzy
 msgid "_Join New Room..."
 msgstr "Nowy pokój"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "Wy_rzuć"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "Klient _poczty:"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Uczestnik"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "_Połącz konta"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "Wiado_mość"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "_Modyfikuj"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 #, fuzzy
 msgid "_Modify Account..."
 msgstr "_Modyfikuj konto..."
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Nazwa: "
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Nigdy"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "Powia_dom mnie o tym"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca."
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "Działania użytk_ownika"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "D_ostępni użytkownicy"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Otwórz Klienta Poczty"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "_Otwórz Link w przeglądarce"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "_Właściciel"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "_Hasło:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Zatrzymaj"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Program odtwarzający dźwięk:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "_Wyświetl"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Ustawienia"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Obecność"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Publikuj"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Zakończ"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "_Usuń z listy kontaktów"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "_Odpowiedz"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Przywróć"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "_Wyślij"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "_Wyślij i Zamknij"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "_Wyślij prywatną wiadomość"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "_Wyślij wiadomość do serwera"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "_Wyślij wiadomość"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Serwer:"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "U_staw obrazek..."
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "_Rozpocznij rozmowę"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Autoryzuj"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Autoryzacja"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Korzystaj z pośrednika"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "_Nazwa użytkownika:"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Głos"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "Konsola _XML..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "Lista przesyłanych plików"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "minutach"
 
@@ -3211,27 +3225,41 @@ msgstr ""
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Stan/Województwo:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "Wiado_mość"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historia rozmowy z %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%s ma teraz status %s (%s)"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Obecny status: %s: %s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "Obecny status: %s: %s"
@@ -3301,7 +3329,7 @@ msgstr "_Połącz konta"
 msgid "You are already in room %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 #, fuzzy
 msgid "You cannot join a room while you are invisible"
 msgstr "Nie możesz dołączyć do pokoju gdy nie jesteś połączony."
@@ -3325,98 +3353,98 @@ msgstr "do konta %s"
 msgid "using %s account"
 msgstr "używając konta %s"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "jako %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "dla konta %s"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s ma teraz status %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów z %s."
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Chciałbym dodać Cię do listy kontaktów"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 #, fuzzy
 msgid "Re_name"
 msgstr "Zmień nazwę"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "_Połącz"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "R_ozłącz"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 #, fuzzy
 msgid "_Change Status Message"
 msgstr "Informacja o statusie %s"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana."
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Jeśli \"%s\" zaakceptuje tę prośbę, to będziesz mógł widzieć jego status."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" zostanie usunięty z Twojej listy kontaktów."
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -3425,59 +3453,59 @@ msgstr ""
 "Usuwając kontakt usuwasz również autoryzację. Kontakt \"%s\" będzie zawsze "
 "widział Cię jako niepołączonego."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Wpisz hasło GPG dla konta %s"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Zapisz hasło"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Aby rozmawiać z innymi osobami musisz założyć konto Jabbera."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3485,7 +3513,7 @@ msgstr ""
 "Wiadomości będą dostępne tylko do czytania, o ile masz włączoną obsługę "
 "historii."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 #, fuzzy
 msgid "Change Status Message..."
 msgstr "Informacja o statusie %s"
@@ -3497,16 +3525,17 @@ msgstr "Informacja o statusie %s"
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "jako "
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "konto: "
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 #, fuzzy
 msgid "Hide this menu"
 msgstr "Ukrywa okno"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr ""
 "Wszystkie kontakty w tej grupie są niedostępne lub wystąpiły w nich błędy"
@@ -3550,29 +3579,29 @@ msgstr ""
 "utracisz tę wiadomość."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Nie możesz wysłać wiadomości dopóki nie będziesz połączony."
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Wysyłanie prywatnej wiadomości nie powiodło się."
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Nie jesteś już w pokoju \"%s\" lub \"%s\" wyszedł."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Szyfrowanie włączone"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Szyfrowanie wyłączone"
 
@@ -3884,227 +3913,227 @@ msgid ""
 "his or her status and/or his status message."
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Śpię"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Oglądam film."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Praca"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Pracuję."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 #, fuzzy
 msgid "marine"
 msgstr "minutach"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr ""
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Nie można dołączyć do pokoju"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr ""
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 #, fuzzy
 msgid "You are banned from this room."
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr ""
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr ""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Zapisaliśmy się do %s"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Prośba o cofnięcie autoryzacji od %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "Wypisaliśmy się z %s"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Połączenie z kontem \"%s\"zostało zerwane."
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Aby dalej wysyłać i odbierać wiadomości musisz się ponownie połączyć."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie można połączyć się z \"%s\""
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, fuzzy, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Połączony z serwerem z %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Sprawdź swoje połączenie lub spróbuj później"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autoryzacja z \"%s\" nie powiodła się"
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Spawdź czy twój login i hasło są poprawne."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "Nie podano klucza OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Zostanie połączony z %s bez obsługi OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "Niewidoczny"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "Rozłączony"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "Jestem %s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4113,17 +4142,17 @@ msgstr ""
 "Temat: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 #, fuzzy
 msgid "Timeout"
 msgstr "Motyw"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr ""
 
@@ -4353,6 +4382,29 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Nowa wiadomość jako %s"
+
+#~ msgid "Chat with"
+#~ msgstr "Rozmowa z"
+
+#~ msgid "E-Mail"
+#~ msgstr "Adres e-mail"
+
+#, fuzzy
+#~ msgid "Send New Message"
+#~ msgstr "Nowa wiadomość"
+
+#~ msgid "as %s"
+#~ msgstr "jako %s"
+
+#~ msgid "as "
+#~ msgstr "jako "
+
 #, fuzzy
 #~ msgid "Send _New Message"
 #~ msgstr "_Nowa wiadomość"
diff --git a/po/pt/LC_MESSAGES/gajim.po b/po/pt/LC_MESSAGES/gajim.po
index 6c3beb7c5..c595ad713 100644
--- a/po/pt/LC_MESSAGES/gajim.po
+++ b/po/pt/LC_MESSAGES/gajim.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Um cliente Jabber GTK+"
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -53,39 +53,40 @@ msgstr "Nenhum"
 msgid "Hidden"
 msgstr "Nome do meio:"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Conversa"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Chat"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "conta: "
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "Fora da lista"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Mudar para %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -101,163 +102,165 @@ msgstr ""
 " global em/etc/profile.\n"
 "A função de destaque de palavras mal soletradas não será usada"
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Todos os %s _minutos"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Som"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "título da mensagem de estado"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "texto da mensagem de estado"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Está neste momento ligado ao servidor"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio"
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços"
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve estar no formato \"utilizador@nomedoservidor\"."
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Tal conta não está disponível"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr "Deve primeiro criar sua conta antes de editar suas informações"
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sem ligação, não lhe é possível editar as suas informações pessoais."
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Erro ao receber as chaves secretas"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Nenhuma chave seleccionada"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Servidor"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "Registar para %s"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Imagem"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "Imagem é muito grande"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -265,67 +268,67 @@ msgstr ""
 "Imagem para emoticon tem de ser menor ou igual a 24 pixels em largura e 24 "
 "em altura."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Escolha chave"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Se remover isto, a ligação será perdida."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Nova Sala"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Este bookmark tem dados inválidos"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, verifique se preencheu os campos servidor e sala ou remova este "
 "bookmark"
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 #, fuzzy
 msgid "Invalid username"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 #, fuzzy
 msgid "You must provide a username to configure this account."
 msgstr "Deve introduzir um nome de utilizador para adicionar uma conta."
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Deve indicar uma palavra-passe à qual a nova conta será associada"
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 #, fuzzy
 msgid "Account has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
@@ -334,20 +337,20 @@ msgstr ""
 "Conta foi adicionada com sucesso.\n"
 "Pode configurar opções avançadas em \"Editar->Contas\" na janela principal. "
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 #, fuzzy
 msgid "Your new account has been created successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
 
@@ -391,13 +394,14 @@ msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
@@ -497,27 +501,26 @@ msgstr "Pedido de subscrição de %s"
 msgid "You can not join a group chat unless you are connected."
 msgstr "Não pode entrar num chat sem estar ligado."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Entrar num Chat como %s"
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Entrar num Chat"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Nova Mensagem como %s"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "para conta %s"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Nova Mensagem"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "_Iniciar Conversa"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -526,130 +529,135 @@ msgstr ""
 "de enviar uma mensagem instantânea:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Deve introduzir uma senha."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas introduzidas em ambos os campos devem ser idênticas."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Nova Mensagem"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Nova Mensagem Instantânea"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 #, fuzzy
 msgid "New Private Message"
 msgstr "_Enviar Mensagem Privada"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, fuzzy, python-format
 msgid "From %s in room %s"
 msgstr "%s está agora %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "De %s"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Transferência de Ficheiro Completa"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "Para %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Mensagem Simples como %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Mensagem Simples"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, fuzzy, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Foi convidado para a sala %s por %s"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
@@ -713,7 +721,7 @@ msgstr ""
 msgid "Re_gister"
 msgstr "Re_gistar"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -734,7 +742,7 @@ msgstr "ID do Utilizador:"
 msgid "Description"
 msgstr "Descrição: %s"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -786,7 +794,7 @@ msgstr "Guardado em: %s"
 msgid "File transfer completed"
 msgstr "Transferência de ficheiro completa"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Abrir Pasta"
 
@@ -894,7 +902,7 @@ msgstr "Remetente: "
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1204,8 +1212,8 @@ msgstr "Aceita este pedido?"
 msgid "error while sending"
 msgstr "erro ao enviar"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Geral"
 
@@ -1233,32 +1241,32 @@ msgstr "Verá-o sempre como estando offline."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contacto com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Verifique a sua ligação ou tente novamente mais tarde."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "A sua chave de acesso está incorrecta"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está neste momento ligado sem a sua chave OpenPGP."
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 #, fuzzy
 msgid "Your personal information has been published successfully."
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1266,12 +1274,12 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 #, fuzzy
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
@@ -1585,7 +1593,7 @@ msgstr "Descrição: %s"
 
 #: ../src/gtkgui.glade.h:11
 #, fuzzy
-msgid "<b>Format of a Chat Line</b>"
+msgid "<b>Format of a line</b>"
 msgstr "<b>Formato de uma linha de conversa</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1821,47 +1829,47 @@ msgid "Bold"
 msgstr "Negrito"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "_Ligar ao arranque"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Cancelar transferência de ficheiro"
 
-#: ../src/gtkgui.glade.h:74
-msgid "Cancels the selected file transfer"
-msgstr "Cancela a transferência de ficheiro seleccionada"
-
 #: ../src/gtkgui.glade.h:75
-#, fuzzy
-msgid "Cancels the selected file transfer and removes incomplete file"
+msgid "Cancels the selected file transfer"
 msgstr "Cancela a transferência de ficheiro seleccionada"
 
 #: ../src/gtkgui.glade.h:76
 #, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr "Cancela a transferência de ficheiro seleccionada"
+
+#: ../src/gtkgui.glade.h:77
+#, fuzzy
 msgid "Chan_ge Password"
 msgstr "Mudar Senha"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Mudar Senha"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Muda _Alcunha"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Muda _Assunto"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Notificação do _estado da conversa:"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Conversa com"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Procurar por uma nova versão ao arranque"
@@ -1999,106 +2007,102 @@ msgid "Display status messages of contacts in roster"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Editar Grupos"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "Editar Detalhes Pessoais..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Activar"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Introduza novamente para confirmação"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Introduza a nova senha:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Eventos"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "De 5 em 5 _minutos"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Complemento:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Família:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Transferências de Ficheiros"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Transferências de Ficheiros"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Gestor de ficheiros:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 #, fuzzy
 msgid "Font style:"
 msgstr "Fonte:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Fonte:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "De:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 #, fuzzy
 msgid "G_o"
 msgstr "Ir"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Personalização de Temas do Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2108,7 +2112,7 @@ msgstr ""
 "informação relativa a uma conversa que o utilizador possa ter com um "
 "contacto, tal como estar a compor uma mensagem"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2116,7 +2120,7 @@ msgstr ""
 "Gajim exibirá automaticamente a nova mensagem recebida numa nova janela de "
 "conversa ou numa aba numa janela existente"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2124,7 +2128,7 @@ msgstr ""
 "Gajim o notificará a cada nova mensagem através de um popup no canto "
 "inferior direito do ecrã"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2132,7 +2136,7 @@ msgstr ""
 "Gajim o notificará através de um popup no canto inferior direito do ecrã "
 "sobre os contactos que se ligarem"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2140,82 +2144,82 @@ msgstr ""
 "Gajim o notificará através de um popup no canto inferior direito do ecrã "
 "sobre os contactos que se desligarem"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim mudará apenas o ícone do contacto que enviou a nova mensagem"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 #, fuzzy
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Passo-a-passo da primeira utilização"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Given:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Grupo:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "Ligação HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Esconde a janela"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Página pessoal:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Nome do Host:"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "Já tenho uma conta e quero usá-la"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Quero _registar uma nova conta"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Gostaria de o adicionar à minha lista de contactos."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Se marcado, o Gajim terá também um ícone na área de notificação"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcado, o Gajim lembrar-se-á da senha para esta conta"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2223,7 +2227,7 @@ msgstr ""
 "Se marcado, o Gajim lembrar-se-á da posição da janela principal na próxima "
 "vez que for executado"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2231,7 +2235,7 @@ msgstr ""
 "Se marcado, o Gajim trocará smilies ASCII tais como ':)' pelos emoticons "
 "gráficos equivalentes."
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2239,7 +2243,7 @@ msgstr ""
 "Se marcado, o Gajim enviará pacotes keep-alive para evitar timeouts da "
 "ligação, os quais resultam na perda dessa ligação"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 #, fuzzy
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -2248,7 +2252,7 @@ msgstr ""
 "Se marcado, o Gajim guardará a sua senha em ~/.gajim/config com permissão de "
 "'leitura' apenas para si e, claro, o administrador"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2258,7 +2262,7 @@ msgstr ""
 "(Por exemplo, um contacto do MSN terá o ícone msn equivalente para o estado "
 "disponível, ausente, ocupado, etc...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2266,14 +2270,14 @@ msgstr ""
 "Se marcado, o Gajim, quando iniciado, ligar-se-á automaticamente ao jabber "
 "usando esta conta"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2281,181 +2285,181 @@ msgstr ""
 "Se tem duas ou mais contas e esta opção for marcada, o Gajim listará todos "
 "os contactos como se tivesse apenas uma conta"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Mensagem recebida:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Info/Consulta"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 #, fuzzy
 msgid "Information about you, as stored in the server"
 msgstr "Informações sobre si estão gravadas no servidor como vCard"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Itálico"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "_Entrar num Chat"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Morada"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Histórico dos registos"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Gerir Contas"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Gerir Bookmarks"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Gerir Emoticons"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Gerir Perfis de Proxy"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Gerir..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Nome do meio:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Mais"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Uma nova versão do Gajim está disponível"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Alcunha:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "SO:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "Em todas as _mensagens"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Abrir Página para Download"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "Ou escolha uma mensagem pré-definida:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Mensagem a enviar:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "_Senha:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 #, fuzzy
 msgid "Personal Information"
 msgstr "Editar Detalhes Pessoais..."
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Telefone:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Porta:"
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Cargo:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "Código Postal:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Prefixo:"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Mostrar hora:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "_Prioridade"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2465,18 +2469,22 @@ msgstr ""
 "servidor jabber quando dois ou mais clientes estão ligados usando a mesma "
 "conta; O cliente com a maior prioridade receberá os eventos"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Perfil, Avatar"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Proxy:"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Recentemente:"
@@ -2576,106 +2584,106 @@ msgid "Send File"
 msgstr "Enviar Ficheiro"
 
 #: ../src/gtkgui.glade.h:246
-#, fuzzy
-msgid "Send New Message"
-msgstr "Nova Mensagem"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Enviar _Mensagem Simples"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "Enviar _Ficheiro"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 #, fuzzy
 msgid "Send _New Message..."
 msgstr "_Nova Mensagem..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Enviar pacotes keep-alive"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr "Envia uma mensagem aos utilizadores ligados ao servidor neste momento"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Recursos dos Servidores"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Definir MOTD"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Definir a Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Definir _Avatar"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Define a Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "Mostrar Contactos _Offline"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Show _Roster"
 msgstr "Mostrar apenas na _lista"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "Consola _XML"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Mostrar apenas na _lista"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr ""
 "Mostra uma lista de transferências de ficheiros entre si e outras pessoas"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "_Ligar"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "_Desligar"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estados"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Estado"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Iniciar _Conversa"
@@ -2684,7 +2692,7 @@ msgstr "Iniciar _Conversa"
 msgid "State:"
 msgstr "Estado:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Estado"
 
@@ -2856,338 +2864,344 @@ msgstr ""
 msgid "Your JID:"
 msgstr "O seu JID:"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Acções"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "_Adicionar Contacto"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "_Adicionar à Lista"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Endereço:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "Avançado"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Autorizar"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid "_Background:"
 msgstr "Cor de fundo"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "_Banir"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "Adicionar esta Sala aos _Bookmarks"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "Vista _Compacta    Alt+C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 #, fuzzy
 msgid "_Contents"
 msgstr "_Continuar"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "_Copiar JID/Endereço de Email"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Copiar Localização do Link"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "_Negar"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_Filter:"
 msgstr "Filtro:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Terminar"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Group Chat"
 msgstr "Chat"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal soletradas"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Host:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar eventos de contactos que não estão na lista"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 #, fuzzy
 msgid "_Join New Room..."
 msgstr "Nova Sala"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "Cliente de e_mail:"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "_Fundir contas"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 #, fuzzy
 msgid "_Modify Account..."
 msgstr "_Editar Conta..."
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Nome: "
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "_Notificar-me"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificar-me quando uma transferência de ficheiro estiver completa"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "Acções de _Ocupantes"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "Utilizadores _Online"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Abrir Compositor de Email"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "_Abrir Link no Navegador"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "_Dono"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Tocador de som:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "_Mostrar a mensagem como pop-up"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Presença"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Publicar"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "_Remover da Lista"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Recuperar"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "_Enviar & Fechar"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "_Enviar Mensagem Privada"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "_Enviar Mensagem de Servidor"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "_Enviar Mensagem Simples"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "_Definir Imagem"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "_Iniciar Conversa"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Estado"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Subscrever"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Subscrição"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Usar proxy"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "Nome de _utilizador"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Voz"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "Consola _XML..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "lista de transferências de ficheiros"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "minutos"
 
@@ -3212,27 +3226,41 @@ msgstr ""
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Estado:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Mensagem"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de Conversas com %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%s está agora  %s (%s)"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado está agora: %s: %s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "O estado está agora: %s: %s"
@@ -3302,7 +3330,7 @@ msgstr "_Fundir contas"
 msgid "You are already in room %s"
 msgstr "Já está na sala %s"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 #, fuzzy
 msgid "You cannot join a room while you are invisible"
 msgstr "Não pode entrar num chat sem estar ligado."
@@ -3326,97 +3354,97 @@ msgstr "para conta %s"
 msgid "using %s account"
 msgstr "usando conta %s"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "como %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "para conta %s"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s está agora  %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr "Deixará de poder enviar e receber mensagens aos contacts de %s."
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para aplicar ao contacto"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 #, fuzzy
 msgid "Re_name"
 msgstr "Renomear"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "_Ligar"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "_Desligar"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 #, fuzzy
 msgid "_Change Status Message"
 msgstr "Mensagem de Estado de %s"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" aceitar este pedido, você passará a saber o seu estado."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Verá-o sempre como estando offline."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -3425,66 +3453,66 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto \"%s\" vê-"
 "lo-á sempre como offline."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Guardar frase de acesso"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr ""
 "As mensagens só poderão ser lidas mais tarde caso tenha o histórico activado."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 #, fuzzy
 msgid "Change Status Message..."
 msgstr "Mensagem de Estado de %s"
@@ -3496,16 +3524,17 @@ msgstr "Mensagem de Estado de %s"
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "como "
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "conta: "
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 #, fuzzy
 msgid "Hide this menu"
 msgstr "Esconde a janela"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr "Todos os contactos deste grupo estão offline ou têm erros"
 
@@ -3546,29 +3575,29 @@ msgstr ""
 "perdida."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "A sua mensagem não pode ser enviada enquanto não estiver ligado."
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Já não se encontra na sala \"%s\" ou \"%s\" saiu."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Encriptação activada"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Encriptação desactivada"
 
@@ -3881,228 +3910,228 @@ msgid ""
 "his or her status and/or his status message."
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "A dormir"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "Volto daqui a alguns minutos"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, por isso deixe-me uma mensagem"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Estou a ver um filme."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "A trabalhar"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Estou a trabalhar"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Estou ao telefone."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Estou fora, fui apreciar a vida"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 #, fuzzy
 msgid "marine"
 msgstr "minutos"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr ""
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr ""
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 #, fuzzy
 msgid "You are banned from this room."
 msgstr "Já está na sala %s"
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr ""
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr ""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "Não está ligado ao servidor"
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos agora subscritos a %s"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "pedido de remoção de subscrição por %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "já não estamos subscritos a %s"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Para continuar a enviar e receber mensagens, precisará de se reconectar."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, fuzzy, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Ligado ao servidor com %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Verifique a sua ligação ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique se o seu login e senha estão correctos."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "Palavra-chave do OpenPGP não foi recebida"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "O utilizador será ligado a %s sem OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "Invisível"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "Estou %s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4111,17 +4140,17 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 #, fuzzy
 msgid "Timeout"
 msgstr "Tema"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr ""
 
@@ -4351,6 +4380,29 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Nova Mensagem como %s"
+
+#~ msgid "Chat with"
+#~ msgstr "Conversa com"
+
+#~ msgid "E-Mail"
+#~ msgstr "E-Mail"
+
+#, fuzzy
+#~ msgid "Send New Message"
+#~ msgstr "Nova Mensagem"
+
+#~ msgid "as %s"
+#~ msgstr "como %s"
+
+#~ msgid "as "
+#~ msgstr "como "
+
 #, fuzzy
 #~ msgid "Send _New Message"
 #~ msgstr "_Nova Mensagem"
diff --git a/po/pt_BR/LC_MESSAGES/gajim.po b/po/pt_BR/LC_MESSAGES/gajim.po
index 7b13ed324..77d0344b0 100644
--- a/po/pt_BR/LC_MESSAGES/gajim.po
+++ b/po/pt_BR/LC_MESSAGES/gajim.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.81\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-09-17 08:41-0300\n"
 "Last-Translator: Juracy Filho <juracy@gmail.com>\n"
 "Language-Team: none\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Um cliente jabber GTK+"
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -53,39 +53,40 @@ msgstr "Nada"
 msgid "Hidden"
 msgstr "Nome do meio:"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Conversa"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Conferência"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "conta: "
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "Fora da lista"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Alternar para %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -101,164 +102,166 @@ msgstr ""
 " globalmente em/etc/profile.\n"
 "Caracteristica de destacar palavras erradas não será usada"
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "A cada %s _minutos"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Ativo"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Som"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "título da mensagem de status"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "texto da mensagem de status"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP não disponível neste computador"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar disconectado."
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido:"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve ter o seguinte formato \"usuário@nomedoservidor\"."
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Conta não disponível"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Você deve primeiro criar sua conta antes de editar suas informações pessoais."
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Você deve estar conectado para editar suas informações pessoais."
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Falha enquanto recebia as chaves secretas"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema no recebimento de suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Nenhuma chave selecionada"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Servidor"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Imagem"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "Imagem é muito grande"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -266,67 +269,67 @@ msgstr ""
 "Imagem para emoticon tem que ser menor ou igual a 24 pixels em largura e 24 "
 "em altura."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Nova Sala"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Bookmark tem dados inválidos"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, tenha certeza que preencheu os campos servidor e sala ou remova "
 "este bookmark"
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 #, fuzzy
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 #, fuzzy
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para adicionar uma conta."
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Você deve entrar com uma senha para registrar uma nova conta."
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 #, fuzzy
 msgid "Account has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
@@ -336,20 +339,20 @@ msgstr ""
 " Você pode configurar opções avançadas em \"Edit->Accounts\" na janela "
 "principal. "
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 #, fuzzy
 msgid "Your new account has been created successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
@@ -393,13 +396,14 @@ msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
@@ -501,27 +505,26 @@ msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Você não pode ingressar em uma sala de conferência até que esteja conectado."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Ingressar numa conferência com %s"
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Nova Mensagem como %s"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "para conta %s"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Nova Mensagem"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "_Iniciar conversa"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -530,130 +533,135 @@ msgstr ""
 "enviar uma mensagem:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, tenha certeza que você está conectado com \"%s\"."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar contectado para mudar sua senha"
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas digitadas em ambos os campos devem ser idênticas."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Nova Mensagem"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Nova Mensagem"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 #, fuzzy
 msgid "New Private Message"
 msgstr "_Enviar Mensagem Privada"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, fuzzy, python-format
 msgid "From %s in room %s"
 msgstr "%s agora está %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "De %s"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Solicitação de Transferência de Arquivos"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Arquivos"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Transferência do Arquivo Completa"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Transferência do Arquivo Parada"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "Para %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Mensagem simples como %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Mensagem simples"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML para %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Você foi convidado para a sala %(room_jid)s por %(contact_jid)s"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
@@ -717,7 +725,7 @@ msgstr ""
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -738,7 +746,7 @@ msgstr "ID do Usuário:"
 msgid "Description"
 msgstr "Descrição: %s"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Ingressar"
 
@@ -789,7 +797,7 @@ msgstr "Salvo em: %s"
 msgid "File transfer completed"
 msgstr "Transferência de arquivos completa"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Abrir pasta do arquivo"
 
@@ -897,7 +905,7 @@ msgstr "Remetente: "
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1202,8 +1210,8 @@ msgstr "Você aceita a solicitação?"
 msgid "error while sending"
 msgstr "erro no envio"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Geral"
 
@@ -1231,32 +1239,32 @@ msgstr "Você sempre o verá como offline."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contato com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Verifique sua conexão ou tente novamente mais tarde."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "Sua frase de acesso está incorreta"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Você está atualmente conectado sem sua chave OpenPGP."
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 #, fuzzy
 msgid "Your personal information has been published successfully."
 msgstr "Seu vCard foi publicado com sucesso."
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1264,12 +1272,12 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 #, fuzzy
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
@@ -1580,7 +1588,7 @@ msgstr "<b>Descrição</b>"
 
 #: ../src/gtkgui.glade.h:11
 #, fuzzy
-msgid "<b>Format of a Chat Line</b>"
+msgid "<b>Format of a line</b>"
 msgstr "<b>Formato da linha de conversa</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1812,46 +1820,46 @@ msgid "Bold"
 msgstr "Negrito"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "C_onectar na inicialização do Gajim"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Cancelar transferência de arquivo"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Cancelar a transferência de arquivo selecionada"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr ""
 "Cancelar a transferência de arquivo selecionada e remove o arquivo incompleto"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Mudar Senha"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Mudar Senha"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Mudar _Apelido"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Mudar _Assunto"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Noti_ficações do status da conversa:"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Conversa com"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Verificar por uma nova versão ao iniciar"
@@ -1990,106 +1998,102 @@ msgid "Display status messages of contacts in roster"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Editar Grupos"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "Editar detalhes pessoais..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Habilitar"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Entre novamente para confirmação:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Entre com a nova senha:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Eventos"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "De 5 em 5 _minutos"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Complemento:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Família:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Transferência de Arquivos"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "Transferência de _Arquivos"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Gerenciamento de arquivos:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 #, fuzzy
 msgid "Font style:"
 msgstr "Fonte:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Fonte:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "De:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 #, fuzzy
 msgid "G_o"
 msgstr "Ir"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Customização de Temas do Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2099,7 +2103,7 @@ msgstr ""
 "informações relacionadas a conversação que você pode ter com um contato tal "
 "como escrever uma mensagem"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2107,7 +2111,7 @@ msgstr ""
 "Gajim automaticamente mostrará a nova mensagem recebida em uma nova janela "
 "de conversa ou aba em uma janela existente"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2115,7 +2119,7 @@ msgstr ""
 "Gajim notificará você de uma nova mensagem via uma alerta visual na lateral "
 "inferior direita da tela"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2123,7 +2127,7 @@ msgstr ""
 "Gajim notificará você através de um alerta visual na parte inferior direita "
 "da tela sobre os contatos que se conectaram"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2131,83 +2135,83 @@ msgstr ""
 "Gajim notificará você através de um alerta visual na parte inferior direita "
 "da tela sobre os contatos que se desconectaram"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim somente mudará o ícone do contato que enviou a nova mensagem"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 #, fuzzy
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Auxíliar de configuração inicial"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Nome:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Grupo:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "Conexão HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Esconder a janela"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Nome do Host:"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "Eu já tenho uma conta e quero usa-la"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Eu quero _registrar uma nova conta"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Por favor, eu gostaria de adiciona-lo à minha lista."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Se marcado, o Gajim também terá um ícone de bandeja"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr ""
 "Se marcado, o Gajim irá ingressar na conferência no ínicio da aplicação"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcado, o Gajim lembrará a senha para esta conta"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2215,7 +2219,7 @@ msgstr ""
 "Se marcado, o Gajim lembrará a posição e tamanho da janela principal na "
 "próxima vez que você executa-lo"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2223,14 +2227,14 @@ msgstr ""
 "Se marcado, o Gajim trocará carinhas em ascii ':)' pelo emoticon gráfico "
 "equivalente"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
 msgstr ""
 "Se marcado, o Gajim enviará pacotes keep-alive que evitam queda de conexão"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 #, fuzzy
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -2239,7 +2243,7 @@ msgstr ""
 "Se marcado, o Gajim gravará sua senha em ~/.gajim/config com permissão de "
 "'leitura' somente para você e claro, o administrador"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2249,7 +2253,7 @@ msgstr ""
 "exemplo, um contato do MSN terá o ícone equivalente do MSN para o status "
 "conectado, ausente, ocupado, etc....)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2257,14 +2261,14 @@ msgstr ""
 "Se marcado, o Gajim, quando carregado, conectará automaticamente ao jabber "
 "usando esta conta"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2272,179 +2276,179 @@ msgstr ""
 "Se você tem duas ou mais contas e isto é marcado, Gajim listará todos os "
 "contatos como se você tivesse somente uma conta"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Mensagem recebida:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Info/Consulta"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 msgid "Information about you, as stored in the server"
 msgstr "Informações sobre você são gravadas no servidor"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Itálico"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "_Ingressar numa Conferência"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Endereço"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Histórico dos registros"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Gerenciar Contas"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Gerenciar Bookmarks"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Gerenciar Emoticons"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Gerenciar Perfis de Proxy"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Gerenciar..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Nome do meio:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Mais"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Nova versão do Gajim está disponível"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Apelido:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Notifique-me sobre contatos ao: "
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "SO:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "Em todas as _mensagens"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Abrir Página para Download"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "Criptografia OpenPGP"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "Ou escolha uma mensagem padrão:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Mensagem enviada:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "_Senha:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 msgid "Personal Information"
 msgstr "Informações Pessoais"
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Telefone:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Porta:"
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Cargo:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "Código Postal:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Prefixo:"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Imprimir tempo:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "_Prioridade"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2454,18 +2458,22 @@ msgstr ""
 "servidor jabber quando dois ou mais clientes estão conectados usando a mesma "
 "conta; O cliente com a maior prioridade receberá os eventos"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Perfil, Avatar"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Proxy:"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Recentemente:"
@@ -2565,105 +2573,105 @@ msgid "Send File"
 msgstr "Enviar arquivo"
 
 #: ../src/gtkgui.glade.h:246
-#, fuzzy
-msgid "Send New Message"
-msgstr "Nova Mensagem"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Enviar _Mensagem Simples"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "Enviar _Arquivo"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 #, fuzzy
 msgid "Send _New Message..."
 msgstr "_Nova Mensagem..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Enviar pacotes para manter a conexão (keep-alive)"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr "Enviar uma mensagem para os usuários conectados neste servidor"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Recursos dos Servidores"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Configurar MOTD"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Configurar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Configurar _Avatar"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Configurar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "Mostrar Contatos desc_onectados"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Show _Roster"
 msgstr "Mostre somente na _lista"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "Console _XML"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Mostre somente na _lista"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Mostrar uma lista de transferências de arquivos entre você e o outro"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "_Conectar"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Ordena contatos pelo status"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Status"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Iniciar conversa"
@@ -2672,7 +2680,7 @@ msgstr "Iniciar conversa"
 msgid "State:"
 msgstr "Estado:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Status"
 
@@ -2841,338 +2849,344 @@ msgstr ""
 msgid "Your JID:"
 msgstr "Seu JID:"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Ações"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "_Adicionar Contato..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "_Adicionar à Lista"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Endereço:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Administração"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Autorizar"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid "_Background:"
 msgstr "Cor de fundo"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "_Banir"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "Adicionar esta Sala ao _Bookmark"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "_Navegar:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "Visão _Compacta    Alt+C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 #, fuzzy
 msgid "_Contents"
 msgstr "_Continuar"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "_Copiar Endereço de Email/JID"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Copia Localização do Link"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "_Negar"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_Filter:"
 msgstr "Filtro:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Encerrar"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Group Chat"
 msgstr "Conferência"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal escritas"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Host:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "Í_cone na bandeja (também conhecido por área de notificação)"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignore eventos de contatos que não estejam na minha lista"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 #, fuzzy
 msgid "_Join New Room..."
 msgstr "Nova Sala"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "_Chutar"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "_Cliente de email:"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "_Juntar contato das contas"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 #, fuzzy
 msgid "_Modify Account..."
 msgstr "_Editar Conta..."
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Nome: "
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "_Notifique-me sobre isto"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificar-me quando a transmissão do arquivo terminar"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "Ações de _Ocupantes"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "Usuários C_onectados"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Abrir Cliente de E-mail"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "_Abrir link no Navegador"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "D_ono"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Tocador de som:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "_Alerta visual"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Presença"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Publicar"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "_Remover da Lista"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Recuperar"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "_Enviar & Fechar"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "_Enviar Mensagem Privada"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "_Enviar Mensagem pelo Servidor"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "_Enviar uma Mensagem Simples"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "_Configurar Imagem"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "_Iniciar conversa"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Inscrever"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Inscrição"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Usar proxy"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "Nome do _usuário"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Voz"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "Console _XML..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "lista de transferência de arquivos"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "minutos"
 
@@ -3197,27 +3211,41 @@ msgstr ""
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Estado:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Mensagem"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de Conversação com %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%s agora está %s (%s)"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status agora é: %s: %s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status agora é: %s: %s"
@@ -3287,7 +3315,7 @@ msgstr "_Juntar contato das contas"
 msgid "You are already in room %s"
 msgstr "Você já está na sala %s"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 #, fuzzy
 msgid "You cannot join a room while you are invisible"
 msgstr ""
@@ -3312,97 +3340,97 @@ msgstr "para %s conta"
 msgid "using %s account"
 msgstr "usando %s conta"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "como %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "para conta %s"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s agora está %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr "Você não poderá enviar e receber mensagens para contatos de %s."
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de adiciona-lo à minha lista"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 #, fuzzy
 msgid "Re_name"
 msgstr "Renomear"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "_Conectar"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 #, fuzzy
 msgid "_Change Status Message"
 msgstr "%s Mensagem de status"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" aceitar esta solicitação, você saberá o seu status."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Você sempre o verá como offline."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -3411,60 +3439,60 @@ msgstr ""
 "Removendo este contato, você também removerá a autorização. Contato \"%s\" "
 "sempre verá você offline."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Frase de acesso é obrigatória"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Entre com a chave GPG para conta %s"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Salvar Frase de acesso"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Você deve configurar uma conta antes de poder conversar com outros contatos."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3472,7 +3500,7 @@ msgstr ""
 "Mensagem somente estará disponível para leitura mais tarde se você tiver o "
 "histórico habilitado."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 #, fuzzy
 msgid "Change Status Message..."
 msgstr "%s Mensagem de status"
@@ -3484,16 +3512,17 @@ msgstr "%s Mensagem de status"
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "como "
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "conta: "
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 #, fuzzy
 msgid "Hide this menu"
 msgstr "Esconder a janela"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr "Todos os contatos deste grupo estão desconectados ou existem erros"
 
@@ -3534,29 +3563,29 @@ msgstr ""
 "perdida."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "Uma conexão não está disponível"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Sua mensagem não pode ser enviada até que esteja conectado."
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Falha ao Enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Você não esta mais na sala \"%s\" ou \"%s\" saiu."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Criptografia habilitada"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Criptografia desabilitada"
 
@@ -3872,226 +3901,226 @@ msgid ""
 "his or her status and/or his status message."
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Comendo"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Eu estou comendo, então deixe-me uma mensagem."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Trabalhando"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Estou fora curtindo a vida"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 #, fuzzy
 msgid "marine"
 msgstr "minutos"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr ""
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Impossível ingressar na sala"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr ""
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 msgid "You are banned from this room."
 msgstr "Você está banido desta sala."
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr ""
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr ""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 msgid "You are not in the members list."
 msgstr "Você não está na lista de membros."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de adiciona-lo à minha lista."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nós estamos agora inscritos para %s"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Remoção de Inscrição solicitada por %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nós estamos agora sem inscrição para %s"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Conexão com a conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Para continuar enviando e recebendo mensagens, você precisará reconectar."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível conectar a \"%s\""
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, fuzzy, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Conectado ao servidor com %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Verifique sua conexão ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique seu login e senha para exatidão."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "Palavra-chave do OpenPGP não foi recebida"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Você será conectado ao %s sem OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "invisível"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "desconectado"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "Eu estou %s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Esta mensagem está criptografada]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4100,17 +4129,17 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 #, fuzzy
 msgid "Timeout"
 msgstr "Tempo"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr ""
 
@@ -4340,6 +4369,29 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Nova Mensagem como %s"
+
+#~ msgid "Chat with"
+#~ msgstr "Conversa com"
+
+#~ msgid "E-Mail"
+#~ msgstr "E-Mail"
+
+#, fuzzy
+#~ msgid "Send New Message"
+#~ msgstr "Nova Mensagem"
+
+#~ msgid "as %s"
+#~ msgstr "como %s"
+
+#~ msgid "as "
+#~ msgstr "como "
+
 #, fuzzy
 #~ msgid "Send _New Message"
 #~ msgstr "_Nova Mensagem"
diff --git a/po/ru/LC_MESSAGES/gajim.po b/po/ru/LC_MESSAGES/gajim.po
index a9d440004..802010602 100644
--- a/po/ru/LC_MESSAGES/gajim.po
+++ b/po/ru/LC_MESSAGES/gajim.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-08-27 02:25+0700\n"
 "Last-Translator: Yakov Bezrukov <nebulam51@gmail.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Jabber-клиент на GTK"
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -62,39 +62,40 @@ msgstr "Нет"
 msgid "Hidden"
 msgstr "Отчество:"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Чат"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Комната"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "аккаунт: "
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "не в ростере"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Переключиться на %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -111,231 +112,233 @@ msgstr ""
 "\n"
 "Выделение слов с опечатками выключено"
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Каждые %s _минут"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Событие"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Звук"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "заголовок сообщения сервера"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "текст сообщение сервера"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Выберите Звуковой Файл"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "В Формате Wav"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "Невозможно использовать OpenPGP"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Вы сейчас подсоединены к серверу"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "Для смены имени аккаунта необходимо отключиться."
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Неверное имя аккаунта"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Имя аккаунта не может быть пустым."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Имя аккаунта не может содержать пробелы."
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID должен иметь формат \"имя_пользователя@сервер\"."
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Неверная запись"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Такой аккаунт недоступен"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Перед редактированием личных данных необходимо сначала создать аккаунт."
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Чтобы отредактировать личную информацию нужно подсоединиться к серверу."
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Не удалось получить секретный ключ"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Есть проблемы с получением вашего OpenPGP секретного ключа."
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Парольная фраза"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Выберите свой OpenPGP ключ"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Не выбран ключ"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Сервер"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Транспорты"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "Редактировать %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Картинка"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "Размер картинки слишком велика"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
 msgstr "Картинка для смайлика должна быть не больше чем 24х24 пикселя."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Выбрать Картинку"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Картинки"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление аккаунта %s"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Аккаунт \"%s\" подключен к серверу"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Новая Комната"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Пожалуйста, удостоверьтесь что заполнены поля с именем сервера и комнаты "
 "либо удалите эту закладку."
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 #, fuzzy
 msgid "Invalid username"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 #, fuzzy
 msgid "You must provide a username to configure this account."
 msgstr "Для добавления аккаунта необходимо ввести имя пользователя."
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Неверный пароль"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Необходимо ввести пароль для нового аккаунта."
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 #, fuzzy
 msgid "Account has been added successfully"
 msgstr "Закладка успешно добавлена"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
@@ -345,20 +348,20 @@ msgstr ""
 "Вы можете настроить аккаунт используя \n"
 "\"Настройка->Аккаунты\" из главного окна."
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 #, fuzzy
 msgid "Your new account has been created successfully"
 msgstr "Закладка успешно добавлена"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Аккаунт уже используется"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "У меня уже есть аккаунт, который я хочу использовать."
 
@@ -402,13 +405,14 @@ msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -507,157 +511,161 @@ msgstr "Запрос на подписку от %s"
 msgid "You can not join a group chat unless you are connected."
 msgstr "Вы не можете зайти в комнату без подключения."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Войти в Комнату как %s"
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Войти в Комнату"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Новое Сообщение как %s"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "для аккаунта %s"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Новое Сообшение"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "Начать Чат"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr "Введите ID пользователя которому вы хотите отправить сообщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Соединение невозможно"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Пожалуйста, удостоверьтесь что вы подключены к \"%s\"."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Для изменения пароль необходимо подсоединиться к серверу."
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Вы должны ввести пароль."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля должны быть одинаковы."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Контакт В Сети"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Контакт Отключился"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Новое Сообшение"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Новое сообшение"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 #, fuzzy
 msgid "New Private Message"
 msgstr "_Отправить Личное Сообщение"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, fuzzy, python-format
 msgid "From %s in room %s"
 msgstr "%s %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "От %s"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Запрос Передачи"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Ошибка Передачи"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Передача Файла Завершена"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "К %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Новое Сообщение как %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Сообщение"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Отправить %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Консоль для %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "XML Консоль"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, fuzzy, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Вас в комнату %s приглашает %s"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
@@ -721,7 +729,7 @@ msgstr ""
 msgid "Re_gister"
 msgstr "Пере_регистрировать"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "_Редактировать"
 
@@ -742,7 +750,7 @@ msgstr "ID пользователя:"
 msgid "Description"
 msgstr "Описание: %s"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Присоединиться"
 
@@ -794,7 +802,7 @@ msgstr "Сохранено в: %s"
 msgid "File transfer completed"
 msgstr "Передача завершена"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Открыть Папку с Принятым Файлом"
 
@@ -902,7 +910,7 @@ msgstr "Отправитель:"
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Продолжить"
 
@@ -1211,8 +1219,8 @@ msgstr "Вы принимаете этот запрос?"
 msgid "error while sending"
 msgstr "ошибка при отправке"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Общие"
 
@@ -1240,32 +1248,32 @@ msgstr "Вы всегда будете видеть его в оффлайне."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Связь с \"%s\" не может быть установлена"
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Проверьте настройки сети или попробуйте еще раз позже."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "Ваша парольная фраза неверна"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы сейчас соединены без OpenPGP ключа."
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 #, fuzzy
 msgid "Your personal information has been published successfully."
 msgstr "Закладка успешно добавлена"
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1273,12 +1281,12 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 #, fuzzy
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши настройки"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
@@ -1592,7 +1600,7 @@ msgstr "Описание: %s"
 
 #: ../src/gtkgui.glade.h:11
 #, fuzzy
-msgid "<b>Format of a Chat Line</b>"
+msgid "<b>Format of a line</b>"
 msgstr "<b>Формат строки в чате</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1824,47 +1832,47 @@ msgid "Bold"
 msgstr "Жирный"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "_Соединяться при запуске Gajim"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Отменить передачу"
 
-#: ../src/gtkgui.glade.h:74
-msgid "Cancels the selected file transfer"
-msgstr "Отменяет выбранную передачу"
-
 #: ../src/gtkgui.glade.h:75
-#, fuzzy
-msgid "Cancels the selected file transfer and removes incomplete file"
+msgid "Cancels the selected file transfer"
 msgstr "Отменяет выбранную передачу"
 
 #: ../src/gtkgui.glade.h:76
 #, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr "Отменяет выбранную передачу"
+
+#: ../src/gtkgui.glade.h:77
+#, fuzzy
 msgid "Chan_ge Password"
 msgstr "Изменить Пароль"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Изменить Пароль"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Изменить _Ник:"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Изменить _Тему"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "_Уведомление об изменении состояния:"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Чат с"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Проверять наличие новой версии Gajim при _запуске"
@@ -2000,106 +2008,102 @@ msgid "Display status messages of contacts in roster"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "Почта:"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "Почта:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Редактировать Группы"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "_Редактировать Личную Информацию..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Редактировать Группы"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Включить"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Введите опять для подтверждения:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Введите новый пароль"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "События"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Каждые 5 _минут"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Дополнительный Адрес:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Фамилия:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Передачи"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Передачи"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Менеджер файлов:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Фильтр:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 #, fuzzy
 msgid "Font style:"
 msgstr "Шрифт:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Шрифт:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Формат: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "От:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 #, fuzzy
 msgid "G_o"
 msgstr "Вперед"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Настройка Тем для Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2109,7 +2113,7 @@ msgstr ""
 "метаданные относящиеся к беседе с контактом таких как например уведомление о "
 "печати сообщения"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2117,7 +2121,7 @@ msgstr ""
 "Gajim будет автоматически показывать новое полученное соощение в новом окне "
 "чата или табе в существующем окне чата"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2125,7 +2129,7 @@ msgstr ""
 "Gajim будет уведомлять вас о новом сообщении с помощью сообщения в правом "
 "нижнем углу экрана"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2133,7 +2137,7 @@ msgstr ""
 "Gajim будет уведомлять вас о присоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2141,89 +2145,89 @@ msgstr ""
 "Gajim будет уведомлять вас о отсоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajim будет лишь менять иконку у контакта, от которого пришло сообщение"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 #, fuzzy
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Мастер первого запуска"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Имя:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Группа:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "HTTP Соединение"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Скрывает окно"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Веб-страница:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Хост: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "У меня уже есть аккаунт, который я хочу использовать"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Я хочу зарегистрировать новый аккаунт"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Вы не возражаете, если я добавлю Вас в контакт лист?"
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Если отмечено, Gajim будет помещать иконку в трей"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Если отмечено, Gajim будет входить в комнату при запуске"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Если отмечено, Gajim запомнит пароль аккаунта"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
 msgstr "Если отмечено, Gajim запомнит позицию и размер окна ростера"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2231,7 +2235,7 @@ msgstr ""
 "Если отмечено, Gajim будет заменять текстовые смайлики, например ':)' их "
 "графическим эквивалентом"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2239,7 +2243,7 @@ msgstr ""
 "Если отмечено, Gajim будет пинговать сервер чтобы избежать разрыва "
 "соединения по таймауту"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 #, fuzzy
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -2248,7 +2252,7 @@ msgstr ""
 "Если отмечено, то Gajim сохранит пароль в ~/.gajim/config с доступом на "
 "чтение только для вас. И администратора системы, конечно же. "
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2258,7 +2262,7 @@ msgstr ""
 "(например: Контакты с MSN будут иметь соответствующие иконки msn для "
 "статусов в сети, ушел, занят и т.д....)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2266,14 +2270,14 @@ msgstr ""
 "Если отмечено, Gajim, после запуска, будет автоматически подсоединяться к "
 "jabber серверу с использование этого аккаунта"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2281,181 +2285,181 @@ msgstr ""
 "Если у вас 2 и более аккаунтов, то отметив здесь, вы заставите Gajim "
 "выводить вместе контакты из всех аккаунтов"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Входящее сообщение:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Информация/Запрос"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 #, fuzzy
 msgid "Information about you, as stored in the server"
 msgstr "Информация о вас хранится на сервере как vCard"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Курсив"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "Войти в _Комнату"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Расположение"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "История:"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Управление Аккаунтами"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Управление Закладками"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Управление Смайликами"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Управление Профилями Прокси"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Управление..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Отчество:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "_Модератор"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Еще"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Имя:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Доступна новая версия Gajim"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Ник:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Нет"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Уведомлять о контактах которые: "
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "В _каждой строке"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Открыть Страницу Загрузки"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Открыть..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "Шифрование OpenPGP"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "Или выберите предустановленное сообщение:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Исходящее сообщение:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "П_ароль"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 #, fuzzy
 msgid "Personal Information"
 msgstr "_Редактировать Личную Информацию..."
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Телефон:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "Проигрывать _звук"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Порт: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Должность:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "Индекс:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Настройки"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Префикс:"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Выводить время:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "Приори_тет:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2465,18 +2469,22 @@ msgstr ""
 "события от jabber сервера когда подсоединены два и более клиента с одним и "
 "тем же аккаунтом. Клиент с наибольшим приоритетом будет получать события"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Профиль, Аватара"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Прокси:"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Недавно:"
@@ -2574,106 +2582,106 @@ msgid "Send File"
 msgstr "_Отправить Файл"
 
 #: ../src/gtkgui.glade.h:246
-#, fuzzy
-msgid "Send New Message"
-msgstr "Новое Сообшение"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Отправить _Сообщение"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "Отправить _Файл"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 #, fuzzy
 msgid "Send _New Message..."
 msgstr "_Новое Сообщение..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Отправить пинг"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Отправить сообщение и закрыть окно"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr ""
 "Отправляет сообщение пользователям подсоединенным к серверу в данный момент"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Параметры Сервера"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Установить MOTD"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Установить фортунку"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Установить _Аватару"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Устанавливает фортунку"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "Показывать _Отключенные контакты"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Show _Roster"
 msgstr "Показывать только в _ростере"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "_XML Консоль"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Показывать только в _ростере"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Показывает список передач между вами и остальными"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "В_ошли"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "В_ышли"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Сортировать контакты по статусу"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Статус"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Начать _Чат"
@@ -2682,7 +2690,7 @@ msgstr "Начать _Чат"
 msgid "State:"
 msgstr "Штат:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Статус"
 
@@ -2850,338 +2858,344 @@ msgstr "Необходимо создать аккаунт для присоед
 msgid "Your JID:"
 msgstr "Ваш JID:"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Действия"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "_Добавить Контакт..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "Добавить в Ростер"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Админ"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Администрирование"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "_Дополнительные действия"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Авторизовать"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid "_Background:"
 msgstr "Цвет фона"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "_Забанить"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "Добавить Эту Комнату в _Закладки"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "_Браузер:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "О_тменить"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "_Компактный Вид    Alt-C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 #, fuzzy
 msgid "_Contents"
 msgstr "_Продолжить"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "_Скопировать JID/Почтовый Адрес"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Копировать адрес ссылки"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "_Отклонить"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_Filter:"
 msgstr "Фильтр:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Закончить"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Group Chat"
 msgstr "Комната"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "Выделять _слова с опечатками"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_История"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Хост: "
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Иконка в трее (или в области уведомления)"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Игнорировать события от контактов не из ростера"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 #, fuzzy
 msgid "_Join New Room..."
 msgstr "Новая Комната"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "_Выгнать"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "_Почтовый клиент:"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Участник"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "_Объединить аккаунты"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Сообщение"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "_Изменить"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 #, fuzzy
 msgid "_Modify Account..."
 msgstr "_Редактировать Аккаунт..."
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Имя: "
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Никогда"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "_Сообщать об этом"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомить меня когда передача файлов завершена"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "_Действия над Посетителем"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "_Пользователи В Сети"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Отправить Письмо"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "_Просмотреть Ссылку в Браузере"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "_Владелец"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Приостановить"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Проигрыватель:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "_Вывести окно"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Настройки"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Присутствие"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Опубликовать"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Выйти"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "_Удалить из Ростера"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "П_ереименовать"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "_Ответить"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Получить"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "_Отправить"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "Отправить и _Закрыть"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "_Отправить Личное Сообщение"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "_Отправить Сообщение Сервера"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "О_тправить Сообщение"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "Установить Картинку"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "Начать Чат"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Статус"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Подписаться"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Подписка"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Использовать прокси"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "_Имя пользователя:"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Право Говорить"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "_XML Консоль..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "список передач"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "минут"
 
@@ -3206,27 +3220,41 @@ msgstr ""
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Штат:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Сообщение"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%s %s (%s)"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Статус установлен в: %s: %s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "Статус установлен в: %s: %s"
@@ -3296,7 +3324,7 @@ msgstr "_Объединить аккаунты"
 msgid "You are already in room %s"
 msgstr "Вы уже в комнате %s"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 #, fuzzy
 msgid "You cannot join a room while you are invisible"
 msgstr "Вы не можете зайти в комнату без подключения."
@@ -3320,27 +3348,27 @@ msgstr "аккаунту %s"
 msgid "using %s account"
 msgstr "используя %s аккаунт"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "как %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "для аккаунта %s"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "для аккаунта %s"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" будет удален"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -3348,70 +3376,70 @@ msgid ""
 msgstr ""
 "У вас теперь не будет возможности приема и отправки сообщения контактам с %s."
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "Назначить OpenPGP Ключ"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ который будет применен к контакту"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Вы не против если я добавлю Вас себе в ростер?"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 #, fuzzy
 msgid "Re_name"
 msgstr "Переименовать"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "_Соединиться"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "_Отключиться"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 #, fuzzy
 msgid "_Change Status Message"
 msgstr "Сообщение о Статусе %s"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь \"%s\" будет знать о вашем статусе."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если \"%s\" примет ваш запрос, вы будете знать его статус"
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Вы всегда будете видеть его в оффлайне."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" будет удален из вашего ростера"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -3420,59 +3448,59 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Контакт \"%s\" "
 "будет всегда видеть вас так как будто вы в оффлайне."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Требуется Пароль"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для аккаунта %s"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Требуется Парольная Фраза"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Введите парольную фразу GPG ключа для %s"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Сохранить парольную фразу (небезопасно)"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Недоступен"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Для начала беседа прежде необходимо создать аккаунт."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3480,7 +3508,7 @@ msgstr ""
 "Сообщения будут доступны для чтения позже если у вас активирована опция "
 "истории."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 #, fuzzy
 msgid "Change Status Message..."
 msgstr "Сообщение о Статусе %s"
@@ -3492,16 +3520,17 @@ msgstr "Сообщение о Статусе %s"
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "как "
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "аккаунт: "
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 #, fuzzy
 msgid "Hide this menu"
 msgstr "Скрывает окно"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr "Все контакты в это группе отключены или имеют ошибки"
 
@@ -3543,29 +3572,29 @@ msgstr ""
 "сообщений, то  сообщение будет потеряно."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "Подключение недоступно"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Не удалось отправить личное сообщение"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Вы больше не находитесь в комнате \"%s\" или \"%s\" вышел."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Шифрование включено"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Шифрование отключено"
 
@@ -3881,227 +3910,227 @@ msgid ""
 "his or her status and/or his status message."
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Скоро буду"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Ем"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Я кушаю, так что оставьте сообщение секретарю."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Я в кино"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Я смотрю кино"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Работаю"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Я работаю"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Я говорю по телефону"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Вышел"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Наслаждаюсь жизнью, чего и вам желаю."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 #, fuzzy
 msgid "marine"
 msgstr "минут"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr ""
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Не могу войти в комнату"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr ""
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 #, fuzzy
 msgid "You are banned from this room."
 msgstr "Вы уже в комнате %s"
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr ""
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr ""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "Вы не подключены к серверу"
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "%s отменил подписку с вами"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запрос на отписку от %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s отменил подписку с вами"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Связь с аккаунтом \"%s\" была потеряна"
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Требуется переподключение для продолжения приема и отправки сообщений."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не могу соединиться с \"%s\""
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, fuzzy, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Подключен к серверу с %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Проверьте настройки сети или попробуйте еще раз позже"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Ошибка аутентификации с \"%s\""
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Пожалуйста, проверьте правильность логина и пароля."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "Не задана парольная фраза OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Вы будете подключены к %s без использования OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "невидимка"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "отключен"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "Я %s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Это сообщения зашифровано]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4110,17 +4139,17 @@ msgstr ""
 "Тема: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 #, fuzzy
 msgid "Timeout"
 msgstr "Тема"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr ""
 
@@ -4350,6 +4379,29 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "ошибка: не могу открыть %s для чтения"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Новое Сообщение как %s"
+
+#~ msgid "Chat with"
+#~ msgstr "Чат с"
+
+#~ msgid "E-Mail"
+#~ msgstr "Почта:"
+
+#, fuzzy
+#~ msgid "Send New Message"
+#~ msgstr "Новое Сообшение"
+
+#~ msgid "as %s"
+#~ msgstr "как %s"
+
+#~ msgid "as "
+#~ msgstr "как "
+
 #, fuzzy
 #~ msgid "Send _New Message"
 #~ msgstr "_Новое Сообщение"
diff --git a/po/sk/LC_MESSAGES/gajim.po b/po/sk/LC_MESSAGES/gajim.po
index cfdc88012..184274ed0 100644
--- a/po/sk/LC_MESSAGES/gajim.po
+++ b/po/sk/LC_MESSAGES/gajim.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: 2005-11-27 16:49+0100\n"
 "Last-Translator: Juraj Michalek <juraj.michalek@asinus.org>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "GTK+ Jabber klient"
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -53,39 +53,40 @@ msgstr "(Nič)"
 msgid "Hidden"
 msgstr "Skrytý"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Rozhovor"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Skupinový rozhovor"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "účet:"
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "nie je v zozname"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Prepnúť na %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -102,164 +103,166 @@ msgstr ""
 "\n"
 "Zvýrazňovanie zle napísaných slov nebude používané"
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Každých %s _minút"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Aktívne"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "titulok správy o stave"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "text správy o stave"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Vybrať zvuk"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Všetky súbory"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Wav zvuk"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP nie je použiteľné na tomto počítači"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Práve ste pripojený na server"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "Pre zmenu mena účtu sa musíte byť odpojený."
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Nesprávne meno účtu"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Meno účtu nemôže byť prázdne."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Meno účtu nemôže obsahovať medzery."
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "Nespravné Jabber ID"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabbe ID musí byť v tvare \"používateľ@menoserveru\""
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Nesprávny záznam"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "Port musí byť číslo."
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Žiadný účet nie je k dispozícii"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Musíte si vytvoriť účet, predtým než budete môcť editovať osobné informácie."
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený na server"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez pripojenia nemôžete meniť osobné informácie."
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Nepodarilo sa vygenerovať tajné kľúče"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Vznikol problém pri získavaní vášho OpenPGP tajného kľúča."
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Passfráza"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Žiadny kľúč nie je vybraný"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Meno"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Server"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Transport"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovať na %s"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Text"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Obrázok"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "Obrázok je príliš veľký"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -267,64 +270,64 @@ msgstr ""
 "Obrázok pre emotikon má menej alebo práve 24 pixelov šírku a 24 pixelov "
 "výšku."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Vyberte obrázok"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstrániť %s účet"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Nová miestnosť"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Táto záložka obsahuje chybné údaje"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Prosim, uistite sa, že je vyplnená položka server a miestnosť alebo "
 "odstránte túto záložku."
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 msgid "Invalid username"
 msgstr "Nesprávne meno používateľa"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 msgid "You must provide a username to configure this account."
 msgstr "Musíte vložiť meno používateľa pre konfuguráciu tohoto účtu."
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Nesprávne heslo"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Musíte vložiť heslo pre nový účet."
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
 "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -333,19 +336,19 @@ msgstr ""
 "možnosti, alebo neskôr kliknutím na položku v menu Účty pod záložkou "
 "Upraviť, v hlavnom okne"
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 msgid "Your new account has been created successfully"
 msgstr "Váš nový účet bol vytvorený úspešne"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr "Nastala chyba pri vytváraní účtu"
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Meno účtu je už používané"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto menom."
 
@@ -391,13 +394,14 @@ msgid "Yesterday"
 msgstr "Včera"
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr "Pred %i dňami"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Predmet: %s\n"
@@ -492,27 +496,26 @@ msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ nie ste prihlásený(á)"
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Pripojiť do diskusnej skupiny ako %s"
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Pripojiť do diskusnej skupiny"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Nová správa ako %s"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "pre účet %s"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Nová správa"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "_Začať rozhovor"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -521,129 +524,134 @@ msgstr ""
 "odoslať správu:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím, uistite sa, že ste pripojený(á) k \"%s\"."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Bez pripojenia nemôžete meniť heslo."
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Musíte vložiť heslo."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "Heslá vložené do oboch polí musia byť rovnaké."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Kontakt sa pripojil"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Kontakt sa odpojil"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Nová správa"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Nová jednoduchá správa"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 msgid "New Private Message"
 msgstr "Nová privátna správa"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, python-format
 msgid "From %s in room %s"
 msgstr "Od %s v miestnosti %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "Od %s"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Požiadavka na prenos súboru"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Chyba pri prenose súboru"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Prenos súboru zastavený"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "Pre %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Jednoduchá správa ako %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Jednoduchá správa"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Poslať %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "Prijatý %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napísal:\n"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konzola pre %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "XML konzola"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Boli ste pozvaný(á) do %(room_jid)s miestnosti - %(contact_jid)s"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentár: %s"
@@ -706,7 +714,7 @@ msgstr "Táto služba neobsahuje žiadne položky."
 msgid "Re_gister"
 msgstr "Re_gistrácia"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "_Upraviť"
 
@@ -725,7 +733,7 @@ msgstr "Používatelia"
 msgid "Description"
 msgstr "Popis"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Pripojiť"
 
@@ -776,7 +784,7 @@ msgstr "Uložené do: %s"
 msgid "File transfer completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Otvoriť adresár"
 
@@ -881,7 +889,7 @@ msgstr "Odosielateľ:"
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Pokračovať"
 
@@ -1187,8 +1195,8 @@ msgstr "Akceptujete túto požiadavku?"
 msgid "error while sending"
 msgstr "chyba pri odosielaní"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Všeobecné"
 
@@ -1215,31 +1223,31 @@ msgstr "Vždy uvidíte jeho alebo ju ako offline."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Spojenie s \"%s\" nie je možné nadviazať"
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Skontrolujte svoje pripojenie alebo skúste neskôr."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "Vaša passfráza je nesprávna"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálne ste pripojení(á) bez vášho OpenPGP kľúča."
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr "zverejnenie vCard úspešné"
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "Your personal information has been published successfully."
 msgstr "Vaše osobné informácie boli úspešne zverejnené."
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr "zverejnenia vCard zlyhalo"
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1248,11 +1256,11 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia."
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Podpora Správy sedenia nie je dostupná (chýba gnome.ui modul)"
 
@@ -1583,7 +1591,8 @@ msgid "<b>Description</b>"
 msgstr "<b>Popis</b>"
 
 #: ../src/gtkgui.glade.h:11
-msgid "<b>Format of a Chat Line</b>"
+#, fuzzy
+msgid "<b>Format of a line</b>"
 msgstr "<b>Formát riadku rozhovoru</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1816,45 +1825,45 @@ msgid "Bold"
 msgstr "Tučné"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "_Pripojiť Gajim pri štarte"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Zrušiť prenos súboru"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Zrušiť prenos vybraných súborov"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Zrušiť prenos vybraných súborov a odstrániť nekompletné súbory"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Zme_niť hesla"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Zmeniť _prezývku"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Zrušiť _predmet"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Zmeniť upozornen_ie na stav:"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Rozprávať sa s"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Skontrolovať nové _verzie Gajimu pri štarte"
@@ -1988,104 +1997,100 @@ msgid "Display status messages of contacts in roster"
 msgstr "Zobraziť stavovú správu kontaktov v zozname"
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Editovať skupiny"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "Editovať osobné informácie..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Editovať _Skupiny"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Povoliť"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Vložte ešte raz pre potvrdenie:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Vložte nové heslo:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Udalosti"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Každých 5 _minút"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Extra adresa:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Priezvysko:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Prenos súborov"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "Prenos _súborov"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Správca súborov:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Štýl fontu:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Font:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formát: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Často kladené otázky (FAQ - online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "Ch_oď"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Úprava tém Gajimu"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2093,7 +2098,7 @@ msgstr ""
 "Gajim môže odoslať a prijať meta-informácie vzťahujúce sa ku konverzácii s "
 "vašim kontaktom"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2101,7 +2106,7 @@ msgstr ""
 "Gajim automaticky zobrazí novo prijaté správy v okne alebo v záložke "
 "existujúceho okna"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2109,7 +2114,7 @@ msgstr ""
 "Gajim vás bude upozorňovať na nové správy cez popup v pravej spodnej časti "
 "obrazovky"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2117,7 +2122,7 @@ msgstr ""
 "Gajim vás bude upozorňovať cez popup v pravej spodnej časti obrazovky o "
 "kontaktoch, ktoré sa práve pripojili"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2125,61 +2130,61 @@ msgstr ""
 "Gajim vás bude upozorňovať popup v pravej spodnej časti obrazovky na "
 "kontakty, ktoré sa práve odpojili"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim bude len meniť ikony kontaktov, ktoré vám odoslali novú správu"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Pomocník - Tvorba účtu"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Meno:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Skupina:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "HTTP spojenie"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr "Online pomoc"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Skrývanie okien"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Domovská stránka:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Meno servera:"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "Už mám účet a chcem ho používať"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Chcem si za_registrovať nový účet"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Chcem si ťa pridať do môjho kontakt listu."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Ak je zaškrtnuté, Gajim bude zobrazovať trayicon"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
@@ -2187,7 +2192,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať avatarov, ak sú nastavení, pre každý "
 "kontakt v zozname"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -2195,15 +2200,15 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať správu o stave, ak je nie je "
 "prázdna, pre všetky kontakty v zozname"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Ak je zaškrtnuté, Gajim sa pripojí do diskusnej skupiny pri štarte"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Ak je zaškrtnuté, Gajim si zapamätá heslo pre tento účet"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2211,7 +2216,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim si bude pamätať pozície a veľkosť zoznamu a "
 "diskusných okien na obrazovke a pri ďalšom spustení ich znova nastaví"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2219,7 +2224,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim nahradí ascii emotikony ako ':)' ekvivalentným "
 "grafickým obrázkom"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2227,7 +2232,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude posielať pakety na udržanie spojenia, čím sa "
 "predchádza vypršaniu platnosti spojenia, ktorého výsledkom je odpojeni"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2235,7 +2240,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim uloží heslo do ~/.gajim/config s oprávnením 'čitať' "
 "len pre vás"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2245,7 +2250,7 @@ msgstr ""
 "kontakt z MSN bude mať ekvivalentné ikonky pre stavy online, preč, "
 "zaneprázdnený, atď...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2253,7 +2258,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim sa pri spustení automatický pripojí na jabber na "
 "tento účet"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 "
@@ -2262,7 +2267,7 @@ msgstr ""
 "Ak je zaškrtnuté, každá zmena globálneho stavu (realizovaná rozbaľovacím "
 "menu na spodku zoznamu) spôsobí zmenu stavu aj v tomto účte"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2270,179 +2275,179 @@ msgstr ""
 "Ak máte dva alebo viac účtov a je zaškrtnuté, Gajim bude vypisovať všetky "
 "kontakty akoby ste mali len jeden účet"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Prichádzajúca správa:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Info/Požiadavka"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 msgid "Information about you, as stored in the server"
 msgstr "Informácie o vás sú uložené na serveri"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr "Prijaté pozvanie"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Kurzíva"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "_Pripojiť sa k skupinovej diskusii"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Miesto"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Záznam histórie"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Upraviť účty"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Upraviť záložky"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Upraviť emotikony"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Upraviť Proxy nastavenia"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Upraviť..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Prostredné meno:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "Mo_derátor"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Viac"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Meno:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Je dostupná nová verzia Gajimu"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Prezývka:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Nič"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Upozorni ma na kontakt, ktorý:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "Operačný systém:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "Pri každej _správe"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Otvor Sťahovaciu stránku"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Otvoriť..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP šifra"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "Alebo vyberte jednu zo správ:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Odchádzajúca správa:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "He_slo:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Heslo"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 msgid "Personal Information"
 msgstr "Osobné informácie"
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Telefónne č.:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "Prehrať _zvuky"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Pozícia:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "PSČ:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Nastavenia"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Prefix:"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Čas tlače:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "Priori_ta:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2452,18 +2457,22 @@ msgstr ""
 "pripojených dvaja alebo viac klientov prostredníctvom jedného účtu; Klient s "
 "najvyššou priritou obdrží udalosť"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Profil, Avatar"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Proxy:"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Posledné:"
@@ -2559,101 +2568,102 @@ msgid "Send File"
 msgstr "Poslať súbor"
 
 #: ../src/gtkgui.glade.h:246
-msgid "Send New Message"
-msgstr "Poslať novú správu"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Poslať jednoduchú _správu"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "Poslať _súbor"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 msgid "Send _New Message..."
 msgstr "Poslať _novú správu..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Poslať pakety na udržiavanie spojenia (keep-alive)"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Poslať správu"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Poslať správu a zatvoriť okno"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr "Posielať správy aktuálne pripojeným používateľom na tomto serveri"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Vlastnosti servera"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Nastaviť správu dňa"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Nastaviť správu dňa"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Nastaviť _avatara"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr "Nastaviť avatara, keď som pripojený(á)"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Nastavovať správu dňa"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr "Zobraziť všetky čakajúce _udalosti"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "Zobraziť _offline kontakty"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 msgid "Show _Roster"
 msgstr "Zobraziť _zoznam"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 msgid "Show _XML Console"
 msgstr "Zobraziť _XML konzolu"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Zobraziť len v _zozname"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Zobraziť zoznam súborov prenesených medzi vami a ostatnými"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "Prihlásiť _sa"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "_Odhlásiť sa"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Zotriediť kontakty podľa stavu"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Stav"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Začať _rozhovor"
@@ -2662,7 +2672,7 @@ msgstr "Začať _rozhovor"
 msgid "State:"
 msgstr "Stav:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Stav"
 
@@ -2831,333 +2841,339 @@ msgstr ""
 msgid "Your JID:"
 msgstr "Vaše JID:"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Akcie"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "_Pridať kontakt..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "_Pridať do zoznamu"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Administrátor"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "_Rozšírené"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Autorizovať"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Background:"
 msgstr "_Pozadie:"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "_Zakázať"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "_Uložiť do záložiek túto miestnosť"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "_Prechádzať:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "_Kompaktný pohľad    Alt+C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Contents"
 msgstr "_Obsahy"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "_Skopírovať JID/E-mailovú adresu"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Skopírovať odkaz"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "_Zakázať"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr "_Preskúmať služby"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr "_Preskúmať služby..."
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Dokončiť"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Group Chat"
 msgstr "Skupinový rozhovor"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "_Zvýrazniť zle napísané slová"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_História"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Server:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Ikonka v paneli (tj. v upozorňovacej oblasti)"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovať udalosti od kontaktov, ktorí nie sú v zozname"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Join New Room..."
 msgstr "_Pripojiť sa do novej miestnosti..."
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "_Vykopnúť"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 #, fuzzy
 msgid "_Log status changes of contacts"
 msgstr "Zobraziť stavovú správu kontaktov v zozname"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "_E-mailový klient:"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Člen"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "_Zlúčiť účty"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Správa"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "_Upraviť"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Modify Account..."
 msgstr "_Upraviť účet..."
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Meno:"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Nikdy"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "_Upozorni ma na to"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Upozorni ma, keď sa dokončí prenos"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "_Akcie člena"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "_Onlien používatelia"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Otvoriť nový e-mail"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "_Otvoriť vo web prehliadači"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "_Vlastník"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Pauza"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Prehrávač:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "_Popup"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Nastavenia"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Prítomnosť"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Zverejniť"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "_Odstrániť zo zoznamu"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "_Odpovedať"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Získať"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "_Poslať"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "_Poslať a zatvoriť"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "_Poslať súkromnú správu"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "_Poslať serverovú správu"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "_Poslať jednoduchú správu"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "_Nastaviť obrázok..."
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "_Začať rozhovor"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Stav"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Zapísať"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Zapísanie"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Použiť proxy"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "_Používateľské meno"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Hlas"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "_XML konzola"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "zoznam prenosu súborov"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "minuty"
 
@@ -3182,27 +3198,41 @@ msgstr "Chyba štruktúry súboru:"
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Nie je možné zapisovať do %s. Správca sedenia nebude fungovať."
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Stav:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Správa"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "História konverzácie s %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je teraz %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je teraz %(status)s\n"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stav je teraz: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stav je teraz: %(status)s\n"
@@ -3271,7 +3301,7 @@ msgstr "Spojiť účty"
 msgid "You are already in room %s"
 msgstr "Už ste v miestnosti %s"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 msgid "You cannot join a room while you are invisible"
 msgstr "Nemôžete sa pripojiť do miestnosti, pokiaľ ste neviditeľný(á)"
 
@@ -3293,27 +3323,27 @@ msgstr "pre %s účet"
 msgid "using %s account"
 msgstr "použiť %s účet"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "ako %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "pre účet %s"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "pre účet %s"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s je teraz %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude odstránený"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3321,68 +3351,68 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy k tomuto kontaktu cez tento "
 "transport."
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "Priradiť OpenPGP kľúč"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Vybrať kľúč a aplikovať ho na kontakt"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Chce si vás pridať do svojho zoznamu"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 msgid "Re_name"
 msgstr "Preme_novať"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "_Prihlásiť"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "_Odhlásiť"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 msgid "_Change Status Message"
 msgstr "_Zmeniť správu o stave"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Od teraz  bude \"%s\" vidieť váš stav."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ak \"%s\" akceptuje túto požiadavku, budete vidieť jeho/jej stav."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Autorizácia bola odoslaná"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Vždy uvidíte jeho alebo ju ako offline."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3390,41 +3420,41 @@ msgstr ""
 "Odstránením tohoto kontaktu, automaticky odstránite aj autorizáciu, to "
 "znamená, že ona/on vás vždy uvidí ako offline."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr "Chcem upozorniť kontakt, na to, že bol odstránený"
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Passfráza je požadovaná"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Vložiť passfrázu GPG kľúč pre účet %s"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Uložiť passfrázu"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr "Ste v jednej alebo viacerých diskusných skupinách"
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3433,26 +3463,26 @@ msgstr ""
 "skupinových diskusií. Ste si skutočne istý(á), že chcete zmeniť stav na "
 "neviditeľný?"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte si vytvoriť účet predtým, než budete môcť komunikovať s ostatnými."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Máte neprečítané správy"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr "Správu bude možné prečítať, ak máte povolenú históriu."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 msgid "Change Status Message..."
 msgstr "Zmeniť Správu o stave..."
 
@@ -3462,15 +3492,16 @@ msgstr "_Zmeniť správu o stave..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "ako"
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "účet:"
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 msgid "Hide this menu"
 msgstr "Ukryť toto menu"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr "Všetky kontakty v tejto skupine sú offline, alebo došlo k chybe"
 
@@ -3510,29 +3541,29 @@ msgstr ""
 "Ak zatvoríte túto záložku a máte deaktivovanú históriu, správa bude stratená."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Vašu správu nie je možné odoslať, pokiaľ nebudete pripojený(á)"
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Odoslanie súkromnej správy sa nepodarilo"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Nie ste už pripojený(á) to miestnosti \"%s\" alebo \"%s\" odišiel(a)."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Šifrovanie zapnuté"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Šifrovanie vypnuté"
 
@@ -3870,59 +3901,59 @@ msgstr ""
 "Ak nie je pravda, nebudete vidieť riadok o zmene stavu kontaktu a jeho/jej "
 "stavovú správu"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Spiaci"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Hneď som späť"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "Som späť za pár minút."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Jedlo"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Práve jem, prosím nechajte mi odkaz."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Pozerám film."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Pracujem"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Pracujem."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Telefón"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Mám hovor."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Vonku"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Šiel som von užívať si život."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -3930,7 +3961,7 @@ msgstr ""
 "Prehrať zvuk keď MUC správa obsahuje slová, ktoré sú v moc_highlihgt_words, "
 "alebo keď MUC správa obsahuje vašu prezývku."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -3939,61 +3970,61 @@ msgstr ""
 "na účet, ak notify_on_all_muc_message je pravda)"
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr "zelená"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr "obchod s potravinami"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr "človek"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 msgid "marine"
 msgstr "námornícka"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr "jednoduchá"
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Nie je možné vstúpiť do miestnosti"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr "Pre vstup do miestnosti je požadované heslo."
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 msgid "You are banned from this room."
 msgstr "Vstup do miestnosti vám bol zakázaný."
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr "Takáto miestnosť neexistuje."
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr "Vytváranie miestností je obmedzené."
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr "Musíte použiť vašu zaregistrovanú prezývku."
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 msgid "You are not in the members list."
 msgstr "Nie ste v zozname."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4001,100 +4032,100 @@ msgstr ""
 "Požadovaná prezývka je používaná alebo už je registrovaná iným členom.\n"
 "Prosím zadajte inú prezývku:"
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Chcel by som si ťa pridať do môjho zoznamu."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sme prihlásení k %s"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "požiadavka na odhlásenie od %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sme odhlásení od %s"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojenie s účtom \"%s\" bolo stratené"
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Pre pokračovanie odosielania a prijímania správ, sa musíte znovu pripojiť."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie je možné pripojiť sa k \"%s\""
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Pripojený na server %s:%s s %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Skontrolujte svoje pripojenie alebo skúste neskôr"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentifikácia bola neúspešná s \"%s\""
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Prosím, skontrolujte správnosť prihlasovacieho mena a hesla."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passfráza nebola zadaná"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Budete pripojený(á) k %s bez OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "neviditeľný"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "Som %s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Táto správa je šifrovaná]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4103,16 +4134,16 @@ msgstr ""
 "Predmet: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Redistračné informácie pre službu %s nedorazili včas"
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 msgid "Timeout"
 msgstr "Čas vypršal"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr "Objavila sa chyba v protokole:"
 
@@ -4332,6 +4363,28 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nie je možné otvoriť %s na čítanie"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Nová správa ako %s"
+
+#~ msgid "Chat with"
+#~ msgstr "Rozprávať sa s"
+
+#~ msgid "E-Mail"
+#~ msgstr "E-Mail"
+
+#~ msgid "Send New Message"
+#~ msgstr "Poslať novú správu"
+
+#~ msgid "as %s"
+#~ msgstr "ako %s"
+
+#~ msgid "as "
+#~ msgstr "ako"
+
 #~ msgid "Re_quest Authorization from"
 #~ msgstr "Pož_iadavka na autorizáciu od"
 
diff --git a/po/sv/LC_MESSAGES/gajim.po b/po/sv/LC_MESSAGES/gajim.po
index 5ed823437..c5a361acf 100644
--- a/po/sv/LC_MESSAGES/gajim.po
+++ b/po/sv/LC_MESSAGES/gajim.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-27 18:04+0100\n"
+"POT-Creation-Date: 2005-11-29 22:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "En GTK jabberklient"
 
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:158
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:158
 #: ../src/tooltips.py:285
 msgid "Gajim"
 msgstr "Gajim"
@@ -56,39 +56,40 @@ msgstr "Ingen"
 msgid "Hidden"
 msgstr "Mellannamn:"
 
-#: ../src/chat.py:180 ../src/gtkgui.glade.h:80
+#: ../src/chat.py:181 ../src/gtkgui.glade.h:81
 msgid "Chat"
 msgstr "Chatt"
 
-#: ../src/chat.py:182 ../src/gtkgui.glade.h:149
+#: ../src/chat.py:183 ../src/gtkgui.glade.h:148
 msgid "Group Chat"
 msgstr "Gruppchatt"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:196
+#: ../src/chat.py:197
 msgid "account: "
 msgstr "konto: "
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:424 ../src/conversation_textview.py:375
+#: ../src/chat.py:422 ../src/conversation_textview.py:375
 #: ../src/dialogs.py:112 ../src/dialogs.py:331 ../src/dialogs.py:369
-#: ../src/dialogs.py:928 ../src/dialogs.py:929 ../src/gajim.py:550
-#: ../src/gajim.py:551 ../src/roster_window.py:970
-#: ../src/roster_window.py:1241 ../src/roster_window.py:1413
-#: ../src/roster_window.py:1661 ../src/roster_window.py:1694
-#: ../src/roster_window.py:2113 ../src/roster_window.py:2356
+#: ../src/dialogs.py:924 ../src/dialogs.py:925 ../src/gajim.py:550
+#: ../src/gajim.py:551 ../src/roster_window.py:968
+#: ../src/roster_window.py:1239 ../src/roster_window.py:1411
+#: ../src/roster_window.py:1660 ../src/roster_window.py:1693
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2356
 #: ../src/roster_window.py:2358 ../src/roster_window.py:2427
+#: ../src/roster_window.py:2435
 msgid "not in the roster"
 msgstr "inte i registret"
 
-#: ../src/chat.py:512
+#: ../src/chat.py:510
 #, python-format
 msgid "Switch to %s"
 msgstr "Växla till %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:726
+#: ../src/chat.py:724
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -104,164 +105,166 @@ msgstr ""
 "\n"
 "Funktionen \"markera felstavade ord\" kommer inte att användas"
 
-#: ../src/config.py:188 ../src/config.py:430
+#: ../src/config.py:184 ../src/config.py:426
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Var %s _minuter"
 
-#: ../src/config.py:304
+#: ../src/config.py:300
 msgid "Active"
 msgstr "Verksam"
 
-#: ../src/config.py:312
+#: ../src/config.py:308
 msgid "Event"
 msgstr "Händelse"
 
-#: ../src/config.py:318
+#: ../src/config.py:314
 msgid "Sound"
 msgstr "Ljud"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message title"
 msgstr "titel för statusmeddelande"
 
-#: ../src/config.py:935
+#: ../src/config.py:926
 msgid "status message text"
 msgstr "text för statusmeddelande"
 
-#: ../src/config.py:986
+#: ../src/config.py:977
 msgid "Choose Sound"
 msgstr "Välj ljud"
 
-#: ../src/config.py:999 ../src/config.py:2077 ../src/vcard.py:173
+#: ../src/config.py:990 ../src/config.py:2078 ../src/vcard.py:173
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/config.py:1004
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Wav ljud"
 
-#: ../src/config.py:1165
+#: ../src/config.py:1156
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP är inte användbart i den här datorn"
 
-#: ../src/config.py:1189
+#: ../src/config.py:1180
 msgid "You are currently connected to the server"
 msgstr "Du är för närvarande ansluten till servern"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1181
 msgid "To change the account name, you must be disconnected."
 msgstr "För att ändra kontonamnet måste du vara frånkopplad"
 
-#: ../src/config.py:1193 ../src/config.py:1197
+#: ../src/config.py:1184 ../src/config.py:1188
 msgid "Invalid account name"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/config.py:1194
+#: ../src/config.py:1185
 msgid "Account name cannot be empty."
 msgstr "Kontonamnet kan inte vara tomt."
 
-#: ../src/config.py:1198
+#: ../src/config.py:1189
 msgid "Account name cannot contain spaces."
 msgstr "Kontonamnet kan inte innehålla mellanslag."
 
-#: ../src/config.py:1206 ../src/config.py:1212 ../src/config.py:1221
-#: ../src/config.py:2579
+#: ../src/config.py:1197 ../src/config.py:1203 ../src/config.py:1212
+#: ../src/config.py:2580
 msgid "Invalid Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/config.py:1213
+#: ../src/config.py:1204
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Ett Jabber-ID måste vara i formen \"användare@server\"."
 
-#: ../src/config.py:1267
+#: ../src/config.py:1258
 msgid "Invalid entry"
 msgstr "Ogiltig post"
 
-#: ../src/config.py:1268
+#: ../src/config.py:1259
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: ../src/config.py:1369
+#: ../src/config.py:1360
 msgid "No such account available"
 msgstr "Inget sådant konto tillgängligt"
 
-#: ../src/config.py:1370
+#: ../src/config.py:1361
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Du måste skapa ditt konto innan du redigerar din personliga information."
 
-#: ../src/config.py:1377 ../src/dialogs.py:637 ../src/dialogs.py:757
+#: ../src/config.py:1368 ../src/dialogs.py:637 ../src/dialogs.py:753
 #: ../src/disco.py:414 ../src/vcard.py:394 ../src/vcard.py:422
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/config.py:1378
+#: ../src/config.py:1369
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Utan en förbindelse kan du inte redigera din personliga information."
 
-#: ../src/config.py:1409
+#: ../src/config.py:1400
 msgid "Failed to get secret keys"
 msgstr "Lyckades inte hämta hemliga nycklar"
 
-#: ../src/config.py:1410
+#: ../src/config.py:1401
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Det var problem med att hämta dina hemliga OpenPGP-nycklar."
 
-#: ../src/config.py:1413 ../src/gtkgui.glade.h:208
+#: ../src/config.py:1404 ../src/gtkgui.glade.h:207
 msgid "Passphrase"
 msgstr "Lösenfras"
 
-#: ../src/config.py:1414
+#: ../src/config.py:1405
 msgid "Choose your OpenPGP key"
 msgstr "Välj din OpenPGP-nyckel"
 
-#: ../src/config.py:1422 ../src/gtkgui.glade.h:196
+#: ../src/config.py:1413 ../src/gtkgui.glade.h:195
 msgid "No key selected"
 msgstr "Ingen nyckel vald"
 
 #. Name column
-#: ../src/config.py:1641 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/config.py:1632 ../src/disco.py:667 ../src/disco.py:1365
+#: ../src/history_window.py:70
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/config.py:1644
+#: ../src/config.py:1635
 msgid "Server"
 msgstr "Server"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1887 ../src/dialogs.py:112 ../src/dialogs.py:293
+#: ../src/config.py:1888 ../src/dialogs.py:112 ../src/dialogs.py:293
 #: ../src/dialogs.py:331 ../src/disco.py:114 ../src/disco.py:115
 #: ../src/disco.py:1150 ../src/roster_window.py:145
 #: ../src/roster_window.py:163 ../src/roster_window.py:185
 #: ../src/roster_window.py:2352 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2427 ../src/systray.py:240
+#: ../src/roster_window.py:2427 ../src/roster_window.py:2435
+#: ../src/systray.py:238
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1927
 #, python-format
 msgid "Edit %s"
 msgstr "Redigera %s"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1929
 #, python-format
 msgid "Register to %s"
 msgstr "Registrera till %s"
 
-#: ../src/config.py:1947
+#: ../src/config.py:1948
 msgid "Text"
 msgstr "Text"
 
-#: ../src/config.py:1955
+#: ../src/config.py:1956
 msgid "Image"
 msgstr "Bild"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid "Image is too big"
 msgstr "Bild är för stor"
 
-#: ../src/config.py:2005
+#: ../src/config.py:2006
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -269,66 +272,66 @@ msgstr ""
 "Bilden för känsloikonen måste vara mindre än eller lika med 24 pixlar i "
 "bredd och 24 i höjd."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2066
 msgid "Choose Image"
 msgstr "Välj bild"
 
-#: ../src/config.py:2082 ../src/vcard.py:178
+#: ../src/config.py:2083 ../src/vcard.py:178
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/config.py:2177
+#: ../src/config.py:2178
 #, python-format
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
 
-#: ../src/config.py:2184
+#: ../src/config.py:2185
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: ../src/config.py:2185
+#: ../src/config.py:2186
 msgid "If you remove it, the connection will be lost."
 msgstr "Om du tar bort det kommer anslutningen förloras."
 
-#: ../src/config.py:2313
+#: ../src/config.py:2314
 msgid "New Room"
 msgstr "Nytt rum"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2344
 msgid "This bookmark has invalid data"
 msgstr "Det här bokmärket har ogiltig data"
 
-#: ../src/config.py:2344
+#: ../src/config.py:2345
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Se till att fylla i server- och rumfälten eller ta bort det här bokmärket."
 
-#: ../src/config.py:2561
+#: ../src/config.py:2562
 #, fuzzy
 msgid "Invalid username"
 msgstr "Ogiltigt användarnamn"
 
-#: ../src/config.py:2562
+#: ../src/config.py:2563
 #, fuzzy
 msgid "You must provide a username to configure this account."
 msgstr "Du behöver ange ett användarnamn för att lägga till ett konto."
 
-#: ../src/config.py:2570 ../src/dialogs.py:776
+#: ../src/config.py:2571 ../src/dialogs.py:772
 msgid "Invalid password"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2572
 msgid "You must enter a password for the new account."
 msgstr "Du måste skriva in ett lösenord för det nya kontot."
 
-#: ../src/config.py:2596
+#: ../src/config.py:2597
 #, fuzzy
 msgid "Account has been added successfully"
 msgstr "Bokmärke har blivit ordentligt tillagt"
 
-#: ../src/config.py:2597 ../src/config.py:2628
+#: ../src/config.py:2598 ../src/config.py:2629
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
@@ -338,20 +341,20 @@ msgstr ""
 "Du kan ställa in avancerade alternativ genom att använda \"Redigera->Konton"
 "\" från huvudfönstret."
 
-#: ../src/config.py:2627
+#: ../src/config.py:2628
 #, fuzzy
 msgid "Your new account has been created successfully"
 msgstr "Bokmärke har blivit ordentligt tillagt"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2643
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2719
+#: ../src/config.py:2720
 msgid "Account name is in use"
 msgstr "Kontonamn används redan"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2721
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
 
@@ -395,13 +398,14 @@ msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
-#: ../src/conversation_textview.py:565
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:566
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:604
+#: ../src/conversation_textview.py:605
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
@@ -500,27 +504,26 @@ msgstr "Prenumerationsförfrågan från %s"
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan inte gå med i en gruppchatt utan att vara ansluten."
 
-#: ../src/dialogs.py:651
-#, python-format
-msgid "Join Group Chat as %s"
+#: ../src/dialogs.py:649
+#, fuzzy, python-format
+msgid "Join Group Chat with account %s"
 msgstr "Anslut till gruppchatt som %s"
 
-#: ../src/dialogs.py:653 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:179
 msgid "Join Group Chat"
 msgstr "Anslut till gruppchatt"
 
-#: ../src/dialogs.py:735
-#, python-format
-msgid "New Message as %s"
-msgstr "Nytt meddelande som %s"
+#: ../src/dialogs.py:731
+#, fuzzy, python-format
+msgid "Start Chat with account %s"
+msgstr "för konto %s"
 
-#. chat message
-#: ../src/dialogs.py:737 ../src/dialogs.py:826 ../src/gajim.py:480
-#: ../src/notify.py:95
-msgid "New Message"
-msgstr "Nytt meddelande"
+#: ../src/dialogs.py:733
+#, fuzzy
+msgid "Start Chat"
+msgstr "_Starta chatt"
 
-#: ../src/dialogs.py:738
+#: ../src/dialogs.py:734
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -529,130 +532,135 @@ msgstr ""
 "skicka ett chattmeddelande till:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:746 ../src/dialogs.py:1088 ../src/dialogs.py:1208
+#: ../src/dialogs.py:742 ../src/dialogs.py:1082 ../src/dialogs.py:1202
 msgid "Connection not available"
 msgstr "Förbindelse inte tillgänglig"
 
-#: ../src/dialogs.py:747 ../src/dialogs.py:1089 ../src/dialogs.py:1209
+#: ../src/dialogs.py:743 ../src/dialogs.py:1083 ../src/dialogs.py:1203
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:754
 msgid "Without a connection, you can not change your password."
 msgstr "Utan en förbindelse kan du inte ändra ditt lösenord."
 
-#: ../src/dialogs.py:777
+#: ../src/dialogs.py:773
 msgid "You must enter a password."
 msgstr "Du måste skriva in ett lösenord."
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:777
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:778
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lösenorden skrivna i båda fälten måste vara identiska."
 
 #. img to display
 #. Notification Type
-#: ../src/dialogs.py:816 ../src/gajim.py:379 ../src/notify.py:89
+#: ../src/dialogs.py:812 ../src/gajim.py:379 ../src/notify.py:89
 msgid "Contact Signed In"
 msgstr "Kontakt loggade in"
 
-#: ../src/dialogs.py:821 ../src/gajim.py:398 ../src/notify.py:92
+#: ../src/dialogs.py:817 ../src/gajim.py:398 ../src/notify.py:92
 msgid "Contact Signed Out"
 msgstr "Kontakt loggade ut"
 
-#: ../src/dialogs.py:826 ../src/gajim.py:478 ../src/notify.py:95
+#. chat message
+#: ../src/dialogs.py:822 ../src/gajim.py:480 ../src/notify.py:95
+msgid "New Message"
+msgstr "Nytt meddelande"
+
+#: ../src/dialogs.py:822 ../src/gajim.py:478 ../src/notify.py:95
 msgid "New Single Message"
 msgstr "Nytt enstaka meddelande"
 
-#: ../src/dialogs.py:827 ../src/dialogs.py:831 ../src/gajim.py:433
+#: ../src/dialogs.py:823 ../src/dialogs.py:827 ../src/gajim.py:433
 #: ../src/notify.py:96 ../src/notify.py:99
 #, fuzzy
 msgid "New Private Message"
 msgstr "_Skicka privat meddelande"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:830
 #, fuzzy, python-format
 msgid "From %s in room %s"
 msgstr "%s är nu %s"
 
-#: ../src/dialogs.py:836 ../src/dialogs.py:842 ../src/dialogs.py:859
+#: ../src/dialogs.py:832 ../src/dialogs.py:838 ../src/dialogs.py:855
 #, python-format
 msgid "From %s"
 msgstr "Från %s"
 
-#: ../src/dialogs.py:838 ../src/gajim.py:883 ../src/notify.py:107
+#: ../src/dialogs.py:834 ../src/gajim.py:886 ../src/notify.py:107
 msgid "File Transfer Request"
 msgstr "Förfrågan om filöverföring"
 
 #. check if we should be notified
-#: ../src/dialogs.py:844 ../src/gajim.py:808 ../src/gajim.py:865
+#: ../src/dialogs.py:840 ../src/gajim.py:811 ../src/gajim.py:868
 #: ../src/notify.py:112
 msgid "File Transfer Error"
 msgstr "Fel i filöverföring"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:914 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:917 ../src/notify.py:115
 #: ../src/notify.py:125 ../src/notify.py:140
 msgid "File Transfer Completed"
 msgstr "Filöverföring klar"
 
-#: ../src/dialogs.py:849 ../src/gajim.py:917 ../src/notify.py:115
+#: ../src/dialogs.py:845 ../src/gajim.py:920 ../src/notify.py:115
 msgid "File Transfer Stopped"
 msgstr "Filöverföring stoppad"
 
-#: ../src/dialogs.py:868
+#: ../src/dialogs.py:864
 #, python-format
 msgid "To %s"
 msgstr "Till %s"
 
-#: ../src/dialogs.py:1052
-#, python-format
-msgid "Single Message as %s"
+#: ../src/dialogs.py:1046
+#, fuzzy, python-format
+msgid "Single Message with account %s"
 msgstr "Enstaka meddelande som %s"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1048
 msgid "Single Message"
 msgstr "Enstaka meddelande"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1051
 #, python-format
 msgid "Send %s"
 msgstr "Skicka %s"
 
-#: ../src/dialogs.py:1066
+#: ../src/dialogs.py:1060
 #, python-format
 msgid "Received %s"
 msgstr "Mottog %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1114
+#: ../src/dialogs.py:1108
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1109
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1153
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konsoll för %s"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1155
 msgid "XML Console"
 msgstr "XML konsole"
 
-#: ../src/dialogs.py:1244
+#: ../src/dialogs.py:1238
 #, fuzzy, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Du har blivit inbjuden till rummet %s av %s"
 
-#: ../src/dialogs.py:1247
+#: ../src/dialogs.py:1241
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -716,7 +724,7 @@ msgstr ""
 msgid "Re_gister"
 msgstr "Re_gistrera"
 
-#: ../src/disco.py:1153 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1066
+#: ../src/disco.py:1153 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1064
 msgid "_Edit"
 msgstr "R_edigera"
 
@@ -737,7 +745,7 @@ msgstr "Användar-ID:"
 msgid "Description"
 msgstr "Beskrivning: %s"
 
-#: ../src/disco.py:1406 ../src/gtkgui.glade.h:347
+#: ../src/disco.py:1406 ../src/gtkgui.glade.h:348
 msgid "_Join"
 msgstr "_Anslut till"
 
@@ -789,7 +797,7 @@ msgstr "Sparad i: %s"
 msgid "File transfer completed"
 msgstr "Filöverföring färdig"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:364
+#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:365
 msgid "_Open Containing Folder"
 msgstr "_Öppna behållande mapp"
 
@@ -897,7 +905,7 @@ msgstr "Sändare: "
 msgid "Pause"
 msgstr "Paus"
 
-#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:327
+#: ../src/filetransfers_window.py:732 ../src/gtkgui.glade.h:328
 msgid "_Continue"
 msgstr "_Fortsätt"
 
@@ -1204,8 +1212,8 @@ msgstr "Accepterar du den här förfrågan?"
 msgid "error while sending"
 msgstr "problem vid sändning"
 
-#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:147 ../src/roster_window.py:1228
+#: ../src/gajim.py:553 ../src/gajim.py:564 ../src/gtkgui.glade.h:145
+#: ../src/roster_window.py:147 ../src/roster_window.py:1226
 msgid "General"
 msgstr "Generellt"
 
@@ -1233,32 +1241,32 @@ msgstr "Du kommer alltid se honom som offline."
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan inte etableras"
 
-#: ../src/gajim.py:602 ../src/common/connection.py:1612
+#: ../src/gajim.py:602 ../src/common/connection.py:1623
 msgid "Check your connection or try again later."
 msgstr "Kontrollera din förbindelse eller försök igen senare."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:755
 msgid "Your passphrase is incorrect"
 msgstr "Din lösenfras är inkorrekt."
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:756
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du är för närvarande ansluten utan din OpenPGP-nyckel."
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:949
+#: ../src/gajim.py:952
 #, fuzzy
 msgid "Your personal information has been published successfully."
 msgstr "Bokmärke har blivit ordentligt tillagt"
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:952
+#: ../src/gajim.py:955
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1266,12 +1274,12 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1226
+#: ../src/gajim.py:1233
 #, fuzzy
 msgid "Could not save your settings and preferences"
 msgstr "Kan inte spara dina inställningar"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1395
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
@@ -1587,7 +1595,7 @@ msgstr "Beskrivning: %s"
 
 #: ../src/gtkgui.glade.h:11
 #, fuzzy
-msgid "<b>Format of a Chat Line</b>"
+msgid "<b>Format of a line</b>"
 msgstr "<b>Format av en chattrad</b>"
 
 #: ../src/gtkgui.glade.h:12
@@ -1821,47 +1829,47 @@ msgid "Bold"
 msgstr "Fetstil"
 
 #: ../src/gtkgui.glade.h:72
+msgid "Build custom query"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "Anslut vid start av Gajim"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Avbryt filöverföring"
 
-#: ../src/gtkgui.glade.h:74
-msgid "Cancels the selected file transfer"
-msgstr "Avbryter the valda filöverföringen"
-
 #: ../src/gtkgui.glade.h:75
-#, fuzzy
-msgid "Cancels the selected file transfer and removes incomplete file"
+msgid "Cancels the selected file transfer"
 msgstr "Avbryter the valda filöverföringen"
 
 #: ../src/gtkgui.glade.h:76
 #, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr "Avbryter the valda filöverföringen"
+
+#: ../src/gtkgui.glade.h:77
+#, fuzzy
 msgid "Chan_ge Password"
 msgstr "Byt lösenord"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Byt lösenord"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Byt smek_namn"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Byt ämne"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Chattstatus notifieringar:"
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat with"
-msgstr "Chatta med"
-
 #: ../src/gtkgui.glade.h:83
 msgid "Check for new _version on Gajim startup"
 msgstr "Titta efter ny _version vid Gajimstart"
@@ -1997,106 +2005,102 @@ msgid "Display status messages of contacts in roster"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:112
-msgid "E-Mail"
-msgstr "E-post"
-
-#: ../src/gtkgui.glade.h:113
 msgid "E-Mail:"
 msgstr "E-post:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Groups"
 msgstr "Redigera grupper"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit Personal Information..."
 msgstr "Redigera personlig information..."
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Edit _Groups"
 msgstr "Redigera _grupper"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Aktivera"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Skriv in det igen för att bekräfta:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Skriv nytt lösenord:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Händelser"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Var 5e _minut"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Extra adress:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Efternamn:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Filöverföringar"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "Fil_överföringar"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Filhanterare:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 #, fuzzy
 msgid "Font style:"
 msgstr "Teckensnitt:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Teckensnitt:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: ÅÅÅÅ-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Från:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 #, fuzzy
 msgid "G_o"
 msgstr "Kör"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Gajim temaanpassare"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2106,7 +2110,7 @@ msgstr ""
 "information relaterad till en konversation som du kan ha med en kontakt, som "
 "att författa ett meddelande"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2114,7 +2118,7 @@ msgstr ""
 "Gajim kommer automatiskt visa nya inkommande meddelanden i ett nytt "
 "chattfönster eller en flik i ett existerande chattfönster"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2122,7 +2126,7 @@ msgstr ""
 "Gajim kommer säga till dig om nya meddelanden med en popup i det nedre högra "
 "hörnet av skärmen"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2130,7 +2134,7 @@ msgstr ""
 "Gajim kommer säga till dig via ett popupfönster i det nedre högra hörnet av "
 "skärmen om kontakter som just loggat in"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2138,83 +2142,83 @@ msgstr ""
 "Gajim kommer säga till dig via ett popupfönster i det nedre högra hörnet av "
 "skärmen om kontakter som just loggat ut"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajim kommer ändra ikonen på kontakten som skickade det nya meddelandet"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 #, fuzzy
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Första-gången guide"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Förnamn:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid "Group:"
 msgstr "Grupp:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid "HTTP Connect"
 msgstr "HTTP anslut"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid "Help online"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid "Hides the window"
 msgstr "Gömmer fönstret"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 msgid "Homepage:"
 msgstr "Hemsida:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Hostname: "
 msgstr "Värdnamn: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:155
 msgid "I already have an account I want to use"
 msgstr "Jag har redan ett konto jag vill använda"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:156
 msgid "I want to _register for a new account"
 msgstr "Jag vill _registrera ett nytt konto"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "I would like to add you to my contact list."
 msgstr "Jag vill lägga till dig i min kontaktlista."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Om ikryssat kommer Gajim också att ha en systembrickeikon"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display an avatar, if one is set, for every contact "
 "in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:160
 msgid ""
 "If checked, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Om ikryssat kommer Gajim ansluta till den här gruppchatten vid start"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:162
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Om ikryssat kommer Gajim komma ihåg lösenordet för det här kontot"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2222,7 +2226,7 @@ msgstr ""
 "Om ikryssat kommer Gajim komma ihåg registrets och chatfönstrets positioner "
 "och storlekar på skärmen nästa gång du kör det"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2230,7 +2234,7 @@ msgstr ""
 "Om ikryssat kommer Gajim ersätta ascii smilies som ':)' med liknande "
 "grafiska känsloikoner"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2238,7 +2242,7 @@ msgstr ""
 "Om ikryssat kommer Gajim skicka håll-vid-liv paket som förhindrar att "
 "anslutningen gör timeout vilket leder till frånkoppling"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:166
 #, fuzzy
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -2247,7 +2251,7 @@ msgstr ""
 "Om ikryssat kommer Gajim spara lösenordet i ~/.gajim/config med \"läs\"-"
 "rättigheter enbart för dig och såklart din administratör"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2257,7 +2261,7 @@ msgstr ""
 "kontakt för MSN kommer ha msns ikon för status online, borta, upptagen, "
 "osv...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2265,14 +2269,14 @@ msgstr ""
 "Om ikryssat kommer Gajim, när det startar, att automatiskt ansluta till "
 "jabber genom det här kontot"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:169
 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 ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:170
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2280,181 +2284,181 @@ msgstr ""
 "Om du har 2 eller fler konton och det här är ikryssat kommer Gajim lista "
 "alla kontakter som om du hade ett konto"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:171
 msgid "Incoming message:"
 msgstr "Inkommande meddelande:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:173
 msgid "Info/Query"
 msgstr "Info/Förfrågan (Info/Query)"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:174
 #, fuzzy
 msgid "Information about you, as stored in the server"
 msgstr "Information om dig är sparad på servern som vCard"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:175
 msgid "Invitation Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:176
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:178
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:180
 msgid "Join _Group Chat"
 msgstr "Anslut till _gruppchatt"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:181
 msgid "Location"
 msgstr "Plats"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:182
 msgid "Log history"
 msgstr "Logghistorik"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Accounts"
 msgstr "Hantera konton"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Bookmarks"
 msgstr "Hantera bokmärken"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:185
 msgid "Manage Emoticons"
 msgstr "Hantera känsloikoner"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:186
 msgid "Manage Proxy Profiles"
 msgstr "Hantera proxyprofiler"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:187
 msgid "Manage..."
 msgstr "Hantera..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:189
 msgid "Middle:"
 msgstr "Mellannamn:"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:190
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:191
 msgid "More"
 msgstr "Mer"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:192
 msgid "Name:"
 msgstr "Namn:"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:193
 msgid "New version of Gajim available"
 msgstr "Ny version av Gajim släppt"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:194
 msgid "Nickname:"
 msgstr "Smeknamn:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:197
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:198
 msgid "Notify me about contacts that: "
 msgstr "Notifiera mig om kontakter som: "
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:199
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:200
 msgid "On every _message"
 msgstr "Vid varje _meddelande"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:201
 msgid "Open Download Page"
 msgstr "Öppna nerladdningssida"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:202
 msgid "Open..."
 msgstr "Öppna..."
 
-#: ../src/gtkgui.glade.h:204 ../src/tabbed_chat_window.py:221
+#: ../src/gtkgui.glade.h:203 ../src/tabbed_chat_window.py:221
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP kryptering"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:204
 msgid "Or choose a preset message:"
 msgstr "Eller välj ett förinställt meddelande:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:205
 msgid "Outgoing message:"
 msgstr "Utgående meddelande:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:206
 msgid "Pass_word:"
 msgstr "Lösen_ord:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:208
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:209
 #, fuzzy
 msgid "Personal Information"
 msgstr "Redigera personlig information..."
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:210
 msgid "Phone No.:"
 msgstr "Telefonnr.:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:211
 msgid "Play _sounds"
 msgstr "_Spela ljud"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:212
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:213
 msgid "Position:"
 msgstr "Position:"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:214
 msgid "Postal Code:"
 msgstr "Postnummer:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:215
 msgid "Preferences"
 msgstr "Inställningar"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:217
 msgid "Prefix:"
 msgstr "Prefix:"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:218
 msgid "Print time:"
 msgstr "Skriv ut tid:"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:219
 msgid "Priori_ty:"
 msgstr "Priori_tet:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:220
 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 "
@@ -2464,18 +2468,22 @@ msgstr ""
 "jabberservern när två eller flera klienter är anslutna på samma konto: "
 "Klienten med den högsta prioriteten får händelserna"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:221
 msgid "Profile, Avatar"
 msgstr "Profil, avatar"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:222
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:223
 msgid "Proxy:"
 msgstr "Proxy:"
 
+#: ../src/gtkgui.glade.h:224
+msgid "Query Builder..."
+msgstr ""
+
 #: ../src/gtkgui.glade.h:225
 msgid "Recently:"
 msgstr "Nyligen:"
@@ -2573,106 +2581,106 @@ msgid "Send File"
 msgstr "Skicka fil"
 
 #: ../src/gtkgui.glade.h:246
-#, fuzzy
-msgid "Send New Message"
-msgstr "Nytt meddelande"
-
-#: ../src/gtkgui.glade.h:247
 msgid "Send Single _Message"
 msgstr "Skicka enstaka _meddelande"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:247
 msgid "Send _File"
 msgstr "Skicka _fil"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:248
 #, fuzzy
 msgid "Send _New Message..."
 msgstr "_Nytt meddelande..."
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:249
 msgid "Send keep-alive packets"
 msgstr "Skicka håll-vid-liv paket"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:250
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:251
 msgid "Send message and close window"
 msgstr "Skicka meddelande och stäng fönster"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:252
 msgid "Sends a message to currently connected users to this server"
 msgstr ""
 "Skickar ett meddelande till nuvarande anslutna klienter på den här servern"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:253
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:254
 msgid "Servers Features"
 msgstr "Serverns funktioner"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:255
 msgid "Set MOTD"
 msgstr "Ställ in MOTD"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:256
 msgid "Set Message of the Day"
 msgstr "Ställ in dagens meddelande"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:257
 msgid "Set _Avatar"
 msgstr "Ställ in _avatar"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:258
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:259
 msgid "Sets Message of the Day"
 msgstr "Ställer in dagens meddelande"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:260
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:261
 msgid "Show _Offline Contacts"
 msgstr "Visa _frånkopplade kontakter"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Show _Roster"
 msgstr "Visa enbart i _registret"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:263
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "_XML konsoll"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:264
 msgid "Show only in _roster"
 msgstr "Visa enbart i _registret"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:265
 msgid "Shows a list of file transfers between you and other"
 msgstr "Visar en lista med filöverföringar mellan dig och andra"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:266
 msgid "Sign _in"
 msgstr "Loggar _in"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:267
 msgid "Sign _out"
 msgstr "Loggar _ut"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:268
 msgid "Sort contacts by status"
 msgstr "Sortera kontakter efter status"
 
+#: ../src/gtkgui.glade.h:269
+#, fuzzy
+msgid "Sta_tus"
+msgstr "Status"
+
 #: ../src/gtkgui.glade.h:270
 msgid "Start _Chat"
 msgstr "Starta _chatt"
@@ -2681,7 +2689,7 @@ msgstr "Starta _chatt"
 msgid "State:"
 msgstr "Delstat:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:272 ../src/history_window.py:88
 msgid "Status"
 msgstr "Status"
 
@@ -2851,338 +2859,344 @@ msgstr ""
 msgid "Your JID:"
 msgstr "Ditt JID:"
 
-#: ../src/gtkgui.glade.h:312
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:313
 msgid "_Actions"
 msgstr "_Åtgärder"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:314
 msgid "_Add Contact..."
 msgstr "_Lägg till kontakt..."
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add to Roster"
 msgstr "_Lägg till registret"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Address:"
 msgstr "_Adress:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Administrator"
 msgstr "_Administratör"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Advanced"
 msgstr "_Avancerat"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Authorize"
 msgstr "_Auktorisera"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid "_Background:"
 msgstr "Bakgrundsfärg"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Ban"
 msgstr "_Bannlys"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Bookmark This Room"
 msgstr "_Bokmärk det här rummet"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Browser:"
 msgstr "_Webbläsare:"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Compact View    Alt+C"
 msgstr "_Kompakt vy Alt+C"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 #, fuzzy
 msgid "_Contents"
 msgstr "_Fortsätt"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:329
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiera JID/e-postadress"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy Link Location"
 msgstr "_Kopiera länkadress"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Deny"
 msgstr "_Neka"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Finish"
 msgstr "_Slutför"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Group Chat"
 msgstr "Gruppchatt"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Highlight misspelled words"
 msgstr "_Markera felstavade ord"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_History"
 msgstr "_Historik"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Host:"
 msgstr "_Värd:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:344
+#: ../src/gtkgui.glade.h:345
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Ikon i systemlåda (aka. notifieringsyta)"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorera händelser från kontakter som inte finns i registret"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 #, fuzzy
 msgid "_Join New Room..."
 msgstr "Nytt rum"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Kick"
 msgstr "_Sparka ut"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Mail client:"
 msgstr "_E-postklient:"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Merge accounts"
 msgstr "Sa_mmanfoga konton"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Modify"
 msgstr "_Modifiera"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 #, fuzzy
 msgid "_Modify Account..."
 msgstr "_Redigera konton..."
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Name: "
 msgstr "_Namn: "
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Never"
 msgstr "_Aldrig"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Notify me about it"
 msgstr "_Notifiera mig om det"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notifiera mig när en filöverföring är färdig"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Occupant Actions"
 msgstr "_Innehavarhandlingar"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_Online Users"
 msgstr "_Anslutna användare"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Open Email Composer"
 msgstr "_Öppna e-postförfattning"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:367
 msgid "_Open Link in Browser"
 msgstr "_Öppna länk i webbläsare"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Owner"
 msgstr "_Ägare"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Password:"
 msgstr "_Lösenord:"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Pause"
 msgstr "_Paus"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Player:"
 msgstr "_Spelare:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pop it up"
 msgstr "_Poppa upp det"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Preferences"
 msgstr "_Inställningar"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Presence"
 msgstr "_Närvaro"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Publish"
 msgstr "_Publicera"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Remove"
 msgstr "Ta _bort"
 
-#: ../src/gtkgui.glade.h:378 ../src/roster_window.py:1072
+#: ../src/gtkgui.glade.h:379 ../src/roster_window.py:1070
 msgid "_Remove from Roster"
 msgstr "Ta bo_rt från register"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Rename"
 msgstr "Byt _namn"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:381
 msgid "_Reply"
 msgstr "_Svara"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Retrieve"
 msgstr "_Hämta"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
+msgid "_Search"
+msgstr ""
+
+#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
+#: ../src/gtkgui.glade.h:385
 msgid "_Send"
 msgstr "_Skicka"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:386
 msgid "_Send & Close"
 msgstr "_Skicka & stäng"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:387
 msgid "_Send Private Message"
 msgstr "_Skicka privat meddelande"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:388
 msgid "_Send Server Message"
 msgstr "_Skicka server meddelande"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Single Message"
 msgstr "_Skicka enstaka meddelande"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:390
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:391
 msgid "_Set Image..."
 msgstr "_Ange bild..."
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:392
 msgid "_Start Chat"
 msgstr "_Starta chatt"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:393
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:394
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:395
 msgid "_Subscription"
 msgstr "_Prenumeration"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:396
 msgid "_Use proxy"
 msgstr "_Använd proxy"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:397
 msgid "_Username:"
 msgstr "_Användarnamn:"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:398
 msgid "_Voice"
 msgstr "_Röst"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:399
 msgid "_XML Console..."
 msgstr "_XML konsoll..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:400
 msgid "file transfers list"
 msgstr "filöverföringslista"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:401
 msgid "minutes"
 msgstr "minuter"
 
@@ -3207,27 +3221,41 @@ msgstr ""
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#: ../src/history_window.py:57 ../src/history_window.py:59
+#: ../src/history_window.py:76
+#, fuzzy
+msgid "Date"
+msgstr "Delstat:"
+
+#: ../src/history_window.py:82
+msgid "Kind"
+msgstr ""
+
+#: ../src/history_window.py:94
+#, fuzzy
+msgid "Message"
+msgstr "_Meddelande"
+
+#: ../src/history_window.py:102 ../src/history_window.py:104
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Konversationshistorik med %s"
 
-#: ../src/history_window.py:180
+#: ../src/history_window.py:249
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:184
+#: ../src/history_window.py:253
 #, fuzzy, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%s är nu %s (%s)"
 
-#: ../src/history_window.py:190
+#: ../src/history_window.py:259
 #, fuzzy, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Statusen är nu: %s: %s"
 
-#: ../src/history_window.py:193
+#: ../src/history_window.py:262
 #, fuzzy, python-format
 msgid "Status is now: %(status)s"
 msgstr "Statusen är nu: %s: %s"
@@ -3297,7 +3325,7 @@ msgstr "Sa_mmanfoga konton"
 msgid "You are already in room %s"
 msgstr "Du är redan i rummet %s"
 
-#: ../src/roster_window.py:310 ../src/roster_window.py:1780
+#: ../src/roster_window.py:310 ../src/roster_window.py:1779
 #, fuzzy
 msgid "You cannot join a room while you are invisible"
 msgstr "Du kan inte gå med i en gruppchatt utan att vara ansluten."
@@ -3321,27 +3349,27 @@ msgstr "till %s konto"
 msgid "using %s account"
 msgstr "använder %s konto"
 
-#: ../src/roster_window.py:521
-#, python-format
-msgid "as %s"
-msgstr "som %s"
+#: ../src/roster_window.py:519
+#, fuzzy, python-format
+msgid "with account %s"
+msgstr "för konto %s"
 
-#: ../src/roster_window.py:532
+#: ../src/roster_window.py:530
 #, python-format
 msgid "for account %s"
 msgstr "för konto %s"
 
-#: ../src/roster_window.py:707
+#: ../src/roster_window.py:705
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s är nu %s (%s)"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: ../src/roster_window.py:825
+#: ../src/roster_window.py:823
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -3350,70 +3378,70 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "från %s"
 
-#: ../src/roster_window.py:875
+#: ../src/roster_window.py:873
 msgid "Assign OpenPGP Key"
 msgstr "Tilldela OpenPGP-nyckel"
 
-#: ../src/roster_window.py:876
+#: ../src/roster_window.py:874
 msgid "Select a key to apply to the contact"
 msgstr "Välj en nyckel att tilldela kontakten"
 
-#: ../src/roster_window.py:991
+#: ../src/roster_window.py:989
 msgid "I would like to add you to my roster"
 msgstr "Jag skulle vilja lägga till dig i mitt register"
 
-#: ../src/roster_window.py:1024
+#: ../src/roster_window.py:1022
 #, fuzzy
 msgid "Re_name"
 msgstr "Döp om"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1043
 msgid "_Log on"
 msgstr "_Logga på"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1052
 msgid "Log _off"
 msgstr "L_ogga av"
 
-#: ../src/roster_window.py:1148
+#: ../src/roster_window.py:1146
 #, fuzzy
 msgid "_Change Status Message"
 msgstr "%s Statusmeddelande"
 
-#: ../src/roster_window.py:1219
+#: ../src/roster_window.py:1217
 msgid "Authorization has been sent"
 msgstr "Auktorisering har sänts"
 
-#: ../src/roster_window.py:1220
+#: ../src/roster_window.py:1218
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: ../src/roster_window.py:1242
+#: ../src/roster_window.py:1240
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: ../src/roster_window.py:1243
+#: ../src/roster_window.py:1241
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Om \"%s\" accepterar din förfrågan kommer du veta hans status."
 
-#: ../src/roster_window.py:1253
+#: ../src/roster_window.py:1251
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Auktorisering har sänts"
 
-#: ../src/roster_window.py:1254
+#: ../src/roster_window.py:1252
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Du kommer alltid se honom som offline."
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1396
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" kommer bli borttagen från registret"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1397
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -3422,59 +3450,59 @@ msgstr ""
 "Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen. "
 "Kontakten \"%s\" kommer alltid se dig som nerkopplad."
 
-#: ../src/roster_window.py:1400
+#: ../src/roster_window.py:1398
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1440
 msgid "Password Required"
 msgstr "Lösenord krävs"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1441
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv in lösenordet för kontot %s"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1442
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1479
 msgid "Passphrase Required"
 msgstr "Lösenfras krävs"
 
-#: ../src/roster_window.py:1482
+#: ../src/roster_window.py:1480
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Skriv in GPG-nyckelns lösenfras för konto %s"
 
-#: ../src/roster_window.py:1483
+#: ../src/roster_window.py:1481
 msgid "Save passphrase"
 msgstr "Spara lösenfras"
 
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
+#: ../src/roster_window.py:1524 ../src/roster_window.py:1584
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1526 ../src/roster_window.py:1586
+#: ../src/roster_window.py:1525 ../src/roster_window.py:1585
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1544
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1545
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du måste skapa ett konto innan du kan chatta med andra kontakter."
 
-#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1944
 msgid "You have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: ../src/roster_window.py:1940 ../src/roster_window.py:1946
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1945
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3482,7 +3510,7 @@ msgstr ""
 "Meddelanden kommer bara vara tillgängliga för läsning senare om du har "
 "historik påslagen."
 
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2600
 #, fuzzy
 msgid "Change Status Message..."
 msgstr "%s Statusmeddelande"
@@ -3494,16 +3522,17 @@ msgstr "%s Statusmeddelande"
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:179 ../src/systray.py:184
-msgid "as "
-msgstr "som "
+#: ../src/systray.py:177 ../src/systray.py:182
+#, fuzzy
+msgid "with account "
+msgstr "konto: "
 
-#: ../src/systray.py:205
+#: ../src/systray.py:203
 #, fuzzy
 msgid "Hide this menu"
 msgstr "Gömmer fönstret"
 
-#: ../src/systray.py:266
+#: ../src/systray.py:264
 msgid "All contacts in this group are offline or have errors"
 msgstr "Alla kontakter i den här gruppen är frånkopplade eller har fel"
 
@@ -3545,29 +3574,29 @@ msgstr ""
 "försvinna."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:636
+#: ../src/tabbed_chat_window.py:634
 msgid "A connection is not available"
 msgstr "En förbindelse är inte tillgänglig"
 
-#: ../src/tabbed_chat_window.py:637
+#: ../src/tabbed_chat_window.py:635
 msgid "Your message can not be sent until you are connected."
 msgstr "Ditt meddelande kan inte skickas förren du är ansluten."
 
-#: ../src/tabbed_chat_window.py:730
+#: ../src/tabbed_chat_window.py:728
 msgid "Sending private message failed"
 msgstr "Skicka privat meddelande misslyckades"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:732
+#: ../src/tabbed_chat_window.py:730
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Du är inte längre i rummet \"%s\" eller \"%s\" har lämnat."
 
-#: ../src/tabbed_chat_window.py:873
+#: ../src/tabbed_chat_window.py:871
 msgid "Encryption enabled"
 msgstr "Kryptering påslaget"
 
-#: ../src/tabbed_chat_window.py:878
+#: ../src/tabbed_chat_window.py:876
 msgid "Encryption disabled"
 msgstr "Kryptering avslagen"
 
@@ -3879,227 +3908,227 @@ msgid ""
 "his or her status and/or his status message."
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:322
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back soon"
 msgstr "Snart tillbaka"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:323
 msgid "Back in some minutes."
 msgstr "Tillbaka om några minuter."
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "Eating"
 msgstr "Äter"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:324
 msgid "I'm eating, so leave me a message."
 msgstr "Jag äter, så lämna ett meddelande."
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:325
 msgid "I'm watching a movie."
 msgstr "Jag tittar på film."
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "Working"
 msgstr "Arbetar"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:326
 msgid "I'm working."
 msgstr "Jag arbetar."
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:327
 msgid "I'm on the phone."
 msgstr "Jag pratar i telefon."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:328
 msgid "I'm out enjoying life"
 msgstr "Jag är ute och njuter av livet."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:337
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:338
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:344
+#: ../src/common/config.py:343 ../src/common/optparser.py:162
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:347 ../src/common/optparser.py:148
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:351
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:355
 #, fuzzy
 msgid "marine"
 msgstr "minuter"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:359 ../src/common/optparser.py:148
 msgid "plain"
 msgstr ""
 
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:437 ../src/common/connection.py:440
-#: ../src/common/connection.py:443 ../src/common/connection.py:446
-#: ../src/common/connection.py:449 ../src/common/connection.py:452
-#: ../src/common/connection.py:460
+#: ../src/common/connection.py:438 ../src/common/connection.py:441
+#: ../src/common/connection.py:444 ../src/common/connection.py:447
+#: ../src/common/connection.py:450 ../src/common/connection.py:453
+#: ../src/common/connection.py:461
 msgid "Unable to join room"
 msgstr "Lyckades inte gå med i rummet"
 
-#: ../src/common/connection.py:438
+#: ../src/common/connection.py:439
 msgid "A password is required to join this room."
 msgstr ""
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:442
 #, fuzzy
 msgid "You are banned from this room."
 msgstr "Du är redan i rummet %s"
 
-#: ../src/common/connection.py:444
+#: ../src/common/connection.py:445
 msgid "Such room does not exist."
 msgstr ""
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:448
 msgid "Room creation is restricted."
 msgstr ""
 
-#: ../src/common/connection.py:450
+#: ../src/common/connection.py:451
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection.py:453
+#: ../src/common/connection.py:454
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:462
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection.py:486 ../src/common/connection.py:1925
+#: ../src/common/connection.py:487 ../src/common/connection.py:1936
 msgid "I would like to add you to my roster."
 msgstr "Jag skulle vilja lägga till dig i mitt register."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:491
+#: ../src/common/connection.py:492
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi prenumererar nu på %s"
 
-#: ../src/common/connection.py:493
+#: ../src/common/connection.py:494
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "avprenumerationsförfrågan från %s"
 
-#: ../src/common/connection.py:495
+#: ../src/common/connection.py:496
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi prenumererar inte längre på %s"
 
-#: ../src/common/connection.py:531 ../src/common/connection.py:553
-#: ../src/common/connection.py:582
+#: ../src/common/connection.py:532 ../src/common/connection.py:554
+#: ../src/common/connection.py:583
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Anslutningen med konto \"%s\" har brutits"
 
-#: ../src/common/connection.py:532 ../src/common/connection.py:554
-#: ../src/common/connection.py:583
+#: ../src/common/connection.py:533 ../src/common/connection.py:555
+#: ../src/common/connection.py:584
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "För att fortsätta skicka och ta emot meddelanden måste du återansluta."
 
-#: ../src/common/connection.py:1271
+#: ../src/common/connection.py:1272
 #, 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 ""
 
-#: ../src/common/connection.py:1611 ../src/common/connection.py:1684
-#: ../src/common/connection.py:2011
+#: ../src/common/connection.py:1622 ../src/common/connection.py:1695
+#: ../src/common/connection.py:2022
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunde inte ansluta till \"%s\""
 
-#: ../src/common/connection.py:1616
+#: ../src/common/connection.py:1627
 #, fuzzy, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Ansluten till server med %s"
 
-#: ../src/common/connection.py:1685
+#: ../src/common/connection.py:1696
 msgid "Check your connection or try again later"
 msgstr "Kontrollera din förbindelse eller försök igen"
 
-#: ../src/common/connection.py:1703
+#: ../src/common/connection.py:1714
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggning misslyckades med \"%s\""
 
-#: ../src/common/connection.py:1704
+#: ../src/common/connection.py:1715
 msgid "Please check your login and password for correctness."
 msgstr "Kontrollera ditt inloggningsnamn och lösenord."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1774
+#: ../src/common/connection.py:1785
 msgid "OpenPGP passphrase was not given"
 msgstr "Lösenordsfras för OpenPGP angavs inte"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1776
+#: ../src/common/connection.py:1787
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du kommer ansluta till %s utan OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1807
+#: ../src/common/connection.py:1818
 msgid "invisible"
 msgstr "osynlig"
 
-#: ../src/common/connection.py:1808
+#: ../src/common/connection.py:1819
 msgid "offline"
 msgstr "nerkopplad"
 
-#: ../src/common/connection.py:1809
+#: ../src/common/connection.py:1820
 #, python-format
 msgid "I'm %s"
 msgstr "Jag är %s"
 
 #. we're not english
-#: ../src/common/connection.py:1879
+#: ../src/common/connection.py:1890
 msgid "[This message is encrypted]"
 msgstr "[Det här meddelandet är krypterat]"
 
-#: ../src/common/connection.py:1903
+#: ../src/common/connection.py:1914
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4108,17 +4137,17 @@ msgstr ""
 "Ämne: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1980
+#: ../src/common/connection.py:1991
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection.py:2313
+#: ../src/common/connection.py:2328
 #, fuzzy
 msgid "Timeout"
 msgstr "Tema"
 
-#: ../src/common/connection.py:2354 ../src/common/connection.py:2366
+#: ../src/common/connection.py:2369 ../src/common/connection.py:2381
 msgid "A protocol error has occured:"
 msgstr ""
 
@@ -4348,6 +4377,29 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "fel: kan inte öppna %s för läsning"
 
+#: ../src/common/optparser.py:157 ../src/common/optparser.py:158
+msgid "cyan"
+msgstr ""
+
+#~ msgid "New Message as %s"
+#~ msgstr "Nytt meddelande som %s"
+
+#~ msgid "Chat with"
+#~ msgstr "Chatta med"
+
+#~ msgid "E-Mail"
+#~ msgstr "E-post"
+
+#, fuzzy
+#~ msgid "Send New Message"
+#~ msgstr "Nytt meddelande"
+
+#~ msgid "as %s"
+#~ msgstr "som %s"
+
+#~ msgid "as "
+#~ msgstr "som "
+
 #, fuzzy
 #~ msgid "Send _New Message"
 #~ msgstr "_Nytt meddelande"
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index de9d8b4c8..d292bba57 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -9738,7 +9738,7 @@ topic</property>
 				  <child>
 				    <widget class="GtkLabel" id="label330">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Actions</property>
+				      <property name="label" translatable="yes" comments="Make sure the character after &quot;_&quot; is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)">_Actions</property>
 				      <property name="use_underline">True</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9845,7 +9845,7 @@ topic</property>
 				  <child>
 				    <widget class="GtkLabel" id="label328">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Send</property>
+				      <property name="label" translatable="yes" comments="Make sure the character after &quot;_&quot; is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)">_Send</property>
 				      <property name="use_underline">True</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -11338,7 +11338,7 @@ Status message</property>
 				  <child>
 				    <widget class="GtkLabel" id="label350">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Actions</property>
+				      <property name="label" translatable="yes" comments="Make sure the character after &quot;_&quot; is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)">_Actions</property>
 				      <property name="use_underline">True</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -11445,7 +11445,7 @@ Status message</property>
 				  <child>
 				    <widget class="GtkLabel" id="label313">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Send</property>
+				      <property name="label" translatable="yes" comments="Make sure the character after &quot;_&quot; is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)">_Send</property>
 				      <property name="use_underline">True</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>