diff --git a/po/bg/LC_MESSAGES/gajim.po b/po/bg/LC_MESSAGES/gajim.po
index cb2e6de41..0342d70a0 100644
--- a/po/bg/LC_MESSAGES/gajim.po
+++ b/po/bg/LC_MESSAGES/gajim.po
@@ -5,12 +5,12 @@
 #
 # 
 # 
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2005-12-13 17:26+0200\n"
 "Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -54,7 +54,7 @@ msgid "Hidden"
 msgstr "Скрита"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -71,62 +71,59 @@ msgstr ""
 "Осветяването на неправилно изписаните думи няма да се използва"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "В момента няма връзка"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Разговор"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Разговор"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP криптиране"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s не предлага OpenPGP ключ и не сте задавали такъв"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Криптирането е включено"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Криптирането е изключено"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "не е в списъка"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -134,20 +131,20 @@ msgstr ""
 "Ако затворите този прозорец и нямате включена опция за запазване на "
 "историята, съобщението ще бъде загубено."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Всеки %s _минути"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Събитие"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -195,200 +192,213 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP не може да бъде използван на този компютър"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "В момента сте свързани със сървъра"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "Трябва да сте изключени, за да смените името на акаунта."
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Трябва да посочите някакво име на акаунта."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Името на акаунта не може да съдържа интервали."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Невалиден Jabber ID"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID трябва да бъде под формата на „user@server“"
 
-#: ../src/config.py:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт"
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Няма такъв наличен акаунт"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../src/config.py:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни."
 
-#: ../src/config.py:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Неуспех при извличането на частните ключове"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP криптиране"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Изберете вашия OpenPGP ключ"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Няма избран ключ"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Сървър"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 #, fuzzy
 msgid "Member List"
 msgstr "_Член"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 #, fuzzy
 msgid "Owner List"
 msgstr "Со_бственик"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Администратор"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 #, fuzzy
 msgid "Nick"
 msgstr "_Изритване"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 #, fuzzy
 msgid "Role"
 msgstr "Роля:"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 #, fuzzy
 msgid "Banning..."
 msgstr "Изритване на %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Какво искате да направите?</b>"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Какво искате да направите?</b>"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Какво искате да направите?</b>"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Администратор"
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Какво искате да направите?</b>"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -398,75 +408,85 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт %s"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "Акаунт „%s“ е свързан към сървъра"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Ако го премахнете, връзката ще се разпадне."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Акаунт „%s“ е свързан към сървъра"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Ако го премахнете, връзката ще се разпадне."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Нова стая"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
 
-#: ../src/config.py:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Невалидно потребителско име"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Невалидна парола"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 msgid "You must enter a password for the new account."
 msgstr "Трябва да въведете парола за новия акаунт."
 
-#: ../src/config.py:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Невалиден Jabber ID"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Контактът вече съществува в списъка."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "Акаунтът беше добавен успешно"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -474,19 +494,19 @@ msgstr ""
 "Може да настроите допълнителните опции, като натиснете бутона „Напреднали“ "
 "или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Новият акаунт беше създаден успешно"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
 
@@ -545,117 +565,116 @@ msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На този компютър няма инсталиран модул на Питон за D-Bus"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Възможностите за D-Bus не могат да бъдат използвани"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Име на контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Транспорти"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "В групата"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "Номер на ключ"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Име на контакта"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "Съобщение за състояние „%s“"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Съобщение за състояние"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Настроени съобщения за състояние</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Напишете новото съобщение за състояние:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Попълнете данните за контакта, който искате да добавите към акаунт „%s“"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Транспорти"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "Невалиден идентификатор"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Тази услуга не съдържа обекти за показване."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Контактът вече е в списъка"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Контактът вече съществува в списъка."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber клиент"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr ""
 "Явор Доганов <yavor@doganov.org>\n"
@@ -664,48 +683,48 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Искане за записване за акаунт „%s“ от %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Влизане в стая с акаунт „%s“"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "Невалидно потребителско име"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започване на разговор с акаунт „%s“"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Започване на разговор"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -714,158 +733,165 @@ msgstr ""
 "искате да изпратите съобщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Трябва да сте свързани, за да променяте паролата."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Трябва да въведете парола."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Ново съобщение"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Ново еднократно съобщение"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Ново частно съобщение"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Запитване за файлов трансфер"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Грешка при файловия трансфер"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Файловият трансфер е приключен"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Файловият трансфер е преустановен"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 #, fuzzy
 msgid "New E-mail"
 msgstr "Е-поща"
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Запитване за файлов трансфер"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Грешка при файловия трансфер"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Файловият трансфер е приключен"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Файловият трансфер е преустановен"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "Не е установен"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Еднократно съобщение с акаунт „%s“"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написа:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML конзола за %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "XML конзола"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s е поканен в %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Други"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Конференции"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Трябва да сте свързани, за да разглеждате наличните услуги"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откриване на налични услуги за акаунт „%s“"
@@ -874,11 +900,11 @@ msgstr "Откриване на налични услуги за акаунт 
 msgid "Service Discovery"
 msgstr "Откриване на услуги"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Услугата не може да бъде намерена"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -886,175 +912,176 @@ msgstr ""
 "Няма услуга на въведения адрес или не отговаря. Проверете адреса и опитайте "
 "отново."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Услугата не е достъпна"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Този вид услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "от акаунт „%s“"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Търсене"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Тази услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Влизане"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Сканиране на %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Потребители"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Описание"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Файл:"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Време"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Напредък"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Име на файл: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Вие"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Изпращач: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Получател: "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Запазен в: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Файловият трансфер завърши"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Отваряне на папката"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Файловият трансфер е прекъснат"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "Не може да бъде установен контакт с отсрещната машина."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Файловият трансфер е преустановен от отсрещната страна"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Избор на файл за изпращане..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Изпращане"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "_Изпращане"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Неуспех при достъпа до този файл"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Този файл се използва от друг процес."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Този файл вече съществува"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Какво искате да направите?</b>"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s иска да ви изпрати файл:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Запазване на файла като..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Искате ли да го презапишете?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1062,7 +1089,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/сек)"
@@ -1079,12 +1106,12 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Изпращач: "
 
@@ -1092,32 +1119,32 @@ msgstr "Изпращач: "
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "П_родължаване"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "показване на помощ за специфична команда"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "показване на помощ за команда"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Показва или скрива списъка"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Показване на следващото непрочетено съобщение в изскачащ прозорец"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1125,46 +1152,46 @@ msgstr ""
 "Показване на списък с всички контакти. Всеки контакт се появява на отделен "
 "ред"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "акаунт"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "показва само контактите на дадения акаунт"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Показване на списък с регистрираните акаунти"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "състояние"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "едно от: offline (изключен), online (на линия), chat (свободен за разговор), "
 "away (отсъствам), xa (не съм на разположение), dnd (зает), invisible "
 "(невидим)"
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "съобщение"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "съобщение за състояние"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1173,21 +1200,21 @@ msgstr ""
 "състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
 "глобалното състояние“"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Показване на диалогов прозорец за разговор, за да може да се изпрати "
 "съобщение до контакта"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID на контакта, с който искате да разговаряте"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако е указано, контактът се взима от списъка с контакти на този акаунт"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1197,127 +1224,127 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на ''."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "JID на контакта, който ще получи съобщението"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "текст на съобщението"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "OpenPGP ключ"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ако е указано, съобщението ще се криптира, използвайки този публичен ключ"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "ако е указано, съобщението ще бъде изпратено от този акаунт"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Получаване на подробна информация за контакта"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID на контакта"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Получаване на подробна информация за контакта"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Нямате активен акаунт"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Изпращане на файл до контакт"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Път до файл"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "ако е указано, файлът бъде изпратен от този акаунт"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Показва всички настройки и техните стойности"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Настройва стойността на „ключ“ на „стойност“."
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "ключ=стойност"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "„ключ“ е името на настройката, „стойност“ е стойността, която се задава"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Изтрива обект от настройките"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "име на настройката з изтриване"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запазва текущото състояние на настройките във файла .config"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Премахване на контакт от списъка"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Добавяне на контакт към списъка"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Добавяне на нов контакт към този акаунт"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Връща текущото състояние (глобалното, в случай, че не е указан акаунт)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr "Връща текущото състояние (глобалното, в случай, че не е указан акаунт)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Имате непрочетени съобщения"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Липсващ аргумент „contact_jid“"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1326,16 +1353,16 @@ msgstr ""
 "„%s“ не е в списъка ви.\n"
 "Укажете акаунт за изпращането на това съобщение."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Нямате активен акаунт"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Неизвестна версия на D-Bus: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1344,16 +1371,16 @@ msgstr ""
 "Употреба: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s не е намерен"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1362,7 +1389,7 @@ msgstr ""
 "Употреба: %s команда [аргументи]\n"
 "Командата е една от:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1371,31 +1398,31 @@ msgstr ""
 "Не е указан аргумент „%s“.\n"
 "Напишете „%s help %s“ за повече информация"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Необходим е X сървър. Спиране на програмата..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim изисква PyGTK 2.6 или по-новаа версия"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim изисква PyGTK 2.6 или по-нова версия. Спиране на програмата..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim изисква GTK 2.6 или по-нова версия"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim изисква GTK 2.6 или по-нова версия. Спиране на програмата..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Липсва поддръжка на libglade за GTK+ runtime"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1404,7 +1431,7 @@ msgstr ""
 "Премахнете текущата версия на GTK+ runtime и инсталирайте последната "
 "стабилна от %s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -1412,127 +1439,146 @@ msgstr ""
 "Уверете се, че версиите на GTK и PyGTK на системата ви имат поддръжка за "
 "libglade."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim изискваа PySQLite2"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) упълномощаване за „%s“ (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Приемате ли това запитване?"
 
-#: ../src/gajim.py:498
-#, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "%(nickname)s в стая %(room_name)s ви изпрати ново съобщение."
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Включи се контакт"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s ви изпрати ново съобщение."
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Изключи се контакт"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Ново частно съобщение"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Ново еднократно съобщение"
+
+#: ../src/gajim.py:610
+#, fuzzy, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Ново съобщение като %s"
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "грешка при изпращане"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Упълномощаването е прието"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контактът „%s“ премахна записването за вас"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Винаги ще го виждате като изключен."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Не може да бъде установен контакт с „%s“"
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Проверете връзката или опитайте отново по-късно."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s вече е %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Паролата е грешна"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "В момента сте свързани без OpenPGP ключ."
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] "Имате непрочетени съобщения"
 msgstr[1] "Имате непрочетени съобщения"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s иска да ви изпрати файл."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получихте %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно изпратихте %(filename)s на %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "Публикуването на визитката е успешно"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Личната информация беше публикувана успешно."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "Неуспех при публикуването на визитката"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1541,161 +1587,145 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
-#: ../src/gajim.py:1719
-#, fuzzy
-msgid "GUI Migration failed"
-msgstr "Неуспех при публикуването на визитката"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "Историята на разговорите беше мигрирана успешно към базата от данни."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Липсва поддръжка за управление на сесиите (модул gnome.ui)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Мигриране на записите на разговорите..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Изчакайте, докато записите на разговорите се мигрират..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Тема"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "име на тема"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Не може да изтриете текущата тема"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Първо изберете друга като текуща тема."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Започване на разговор"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Започване на разговор"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на частно съобщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Вече не сте в стая „%s“ или „%s“ е напуснал(а)."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Стая"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Стая"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Няма тема за тази стая"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s беше изритан от %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s вече е познат като %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s напусна"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s сега е %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Псевдонимът не е намерен: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s е поканен в %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "„%s“ изглежда не е валиден JID"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Няма такава команда: /%s (ако искате да изпратите това, сложете представка /"
 "say)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Команди: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1707,7 +1737,7 @@ msgstr ""
 "Псевдонимът може да се замества, но не и ако съдърж „@“. Ако контактът е в "
 "стаята, той също ще бъде изритан. Не се поддържат интервали в псевдонима."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1715,12 +1745,12 @@ msgstr ""
 "Употреба: /%s <псевдоним>, отваря прозорец за лично съобщение със съответния "
 "контакт."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Употреба: /%s, изчиства текстовия прозорец."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1729,12 +1759,12 @@ msgstr ""
 "Употреба: /%s [причина], затваря текущия прозорец или подпрозорец и показва "
 "причина, ако е указана."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Употреба: /%s, настройва прозореца на стаята на компактен изглед."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1743,7 +1773,7 @@ msgstr ""
 "Употреба: /%s <JID> [причина], кани JID в текущата стая, причината е по "
 "избор."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1752,7 +1782,7 @@ msgstr ""
 "Употреба: /%s <стая>@<сървър>[/псевдоним], предлага влизане в стая@сървър, "
 "използването на указания псевдоним е по избор."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1763,7 +1793,7 @@ msgstr ""
 "от стаята и евентуално показва причина. Не се поддържат интервали в "
 "псевдонима."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1772,7 +1802,7 @@ msgstr ""
 "Употреба: /%s <действие>, изпраща действие до текущата стая. Използва се "
 "трето лице (т.е. „/%s експлодира“)."
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1781,17 +1811,17 @@ msgstr ""
 "Употреба: /%s <псевдоним> [съобщение], отваря прозорец за лично съобщение и "
 "изпраща съобщение до участника, указан с псевдонима."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Употреба: /%s <псевдоним>, сменя псевдонима ви в текущата стая."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Употреба: /%s [тема], показва или актуализира темата на текущата стая."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -1799,70 +1829,70 @@ msgstr ""
 "Употреба: /%s <съобщение>, изпраща съобщение без да се имат предвид други "
 "команди."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Няма помощна информация за /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "Да _не се задава този въпрос отново"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Промяна на темата"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Въведете новата тема:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Промяна на псевдонима"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Въведете новия псевдоним, който искате да използвате:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Отметката вече е установена"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "Стаята „%s“ вече присъства в отметките."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Отметката беше добавена успешно"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Може да организирате отметките чрез менюто „Действия“."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Изритване на %s"
@@ -1909,111 +1939,120 @@ msgstr "<b>Редактор на настройките за напреднал
 msgid "<b>Applications</b>"
 msgstr "<b>Програми</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Персонални</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Описание</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Формат на реда</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Персонализиране на интерфейса</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber трафик</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Разни</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Лични данни</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Изберете една от опциите по-долу:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Попълнете данните за нов акаунт</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Изберете една от опциите по-долу:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Настроени съобщения за състояние</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Настройки</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Настройки</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Звуци</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Напишете новото съобщение за състояние:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Зрителни уведомомления</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Какво искате да направите?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>Вход в XML формат</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "А_каунти"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "След псевдонима:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "Относно"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Приемане"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Акаунт"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2025,52 +2064,44 @@ msgstr ""
 "Контакт\n"
 "Лента"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Промяна на акаунт"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Акаунти"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "Действия за _напреднали"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Добавяне на нов контакт"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Зрителни уведомомления</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Добавяне на _контакт"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Адрес"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Напреднали"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Редактор на настройки за напреднали"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "След псевдонима:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "След времето:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2080,57 +2111,57 @@ msgstr ""
 "Само при писане\n"
 "Изключено"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Позволяване изпращането на информация за _ОС"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Позволение за виждане на състоянието ми"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Позволяване на прозорци/уведомления при _Отсъствам/Не съм на разположение/"
 "Зает/Невидим"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "Познато и като стил „iChat“"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Питане за съобщение за състояние при преминаване в режим:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Запитване за състоянието на контакта"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Питане за:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Задаване на Open_PGP ключ"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Упълномощаване на контакта, така че да знае кога сте свързани"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Автоматично „_Отсъствам“ след:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Автоматично „Не съм на _разположение“ след:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Автоматично влизане"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2142,15 +2173,15 @@ msgstr ""
 "Винаги да се използват стандартните програми на KDE\n"
 "Персонални"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Автоматично упълномощаване на контакта"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Автоматично свързване при разпадане на връзката"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2163,13 +2194,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Преди псевдонима:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Преди времето:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Преди псевдонима:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2285,133 +2313,137 @@ msgid "Company:"
 msgstr "Фирма:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Настройки на _стаята"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Свързване при натискане на бутона „Приключване“"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Свързване"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Данни за контакта"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "_Данни за контакта"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "История на разговорите"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "Държава:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "Стандартен _набор икони за състояние:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Изтриване на MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Изтриване на съобщението за деня"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Изтрива съобщението за деня"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Отказване"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Отказване на упълномощаване на контакт, така че да не знае кога сте свързани"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Отдел:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Показване на аватари на контактите в списъка"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Показване на съобщенията за състояние на контактите в списъка"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "Е-поща:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "Всеки 5 _минути"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Редактиране на групи"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Редактиране на личните данни..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Редактиране на _групи"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Управление на емотикони"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Активиране"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Въведете я отново за потвърждение:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Въведете нова парола:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Събития"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "Всеки 5 _минути"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Допълнителен адрес:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Фамилия:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Файлови трансфери"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "_Файлови трансфери"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Файлов мениджър:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Филтър:"
@@ -2421,39 +2453,35 @@ msgid "Font style:"
 msgstr "Стил на шрифта:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Шрифт:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Забрана за виждане на състоянието ми"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Формат: гггг-мм-дд"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Често задавани въпроси (уеб страница)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "От:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "_Отиване"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Персонализиране на темите на Gajim"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2463,7 +2491,7 @@ msgstr ""
 "Gajim може да изпраща и получава мета-информация, свързана с разговора с "
 "даден контакт"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2471,14 +2499,14 @@ msgstr ""
 "Автоматично ще се показва новото съобщение в нов прозорец за разговор или "
 "подпрозорец в съществуващ прозорец"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
 msgstr "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2486,7 +2514,7 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "свързване на контакти"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2494,25 +2522,33 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "изключване на контакти"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Само ще се променя иконата на контакта, който е изпратил съобщението"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Помощник за създаване на акаунт"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Общи"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Собствено:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Няма"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Група:"
@@ -2560,18 +2596,23 @@ msgid "I would like to add you to my contact list."
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
 #: ../src/gtkgui.glade.h:170
-msgid "If checked, Gajim will also have a trayicon"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
 msgstr ""
-"Ако тази опция е избрана, Gajim ще има и икона в областта за уведомяване."
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr "Ако е избрано, Gajim ще изобразява аватари на контакти в списъка"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Ако е избрано, съобщенията за състояние на контактите ще се показват под "
 "имената им в списъка."
@@ -2653,8 +2694,9 @@ msgstr ""
 "всички контакти като от един акаунт."
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Входящо съобщение:"
+#, fuzzy
+msgid "Inactive"
+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:185
@@ -2690,39 +2732,57 @@ msgid "Location"
 msgstr "Местонахождение"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Съобщение"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Управление на..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Управление на акаунти"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Управление на отметките"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Настройки на сървъра-посредник"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Управление на..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Бащино:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "_Председател"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Още"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Име:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2730,109 +2790,105 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Псевдоним:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Няма"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Уведомяване за контакти при: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "На _всяко съобщение"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 #, fuzzy
 msgid "One message _window:"
 msgstr "Изпращане на съобщението и затваряне на прозореца"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Отваряне..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Изходящо съобщение:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "_Парола:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Парола"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Временно преустановен"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Лични данни"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Телефон:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Изпълнение на _звуци"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Порт: "
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Длъжност:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Пощенски код:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Настройки"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Обръщение:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "съобщение за състояние"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Изписване на времето:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Приори_тет:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2842,60 +2898,52 @@ msgstr ""
 "събитията от Jabber сървър, когато два или повече клиента са свързани с един "
 "и същ акаунт. Клиентът с най-голям приоритет ще получава събитията."
 
-#: ../src/gtkgui.glade.h:237
-msgid "Profile, Avatar"
-msgstr "Профил и аватар"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Сървър-посредник:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Изготвяне на заявки..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Скоро посетени:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Регистриране към"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Премахване на акаунт _само от Gajim"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Премахване на акаунт от Gajim и от с_ървъра"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Премахване на файловия трансфер от списъка."
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr ""
 "Премахва завършилите, прекъснатите или провалени файлови трансфери от списъка"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Отговор на това съобщение"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Възстановяване на стандартните цветове"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "Ре_сурс: "
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2909,171 +2957,163 @@ msgstr ""
 "ресурси „Вкъщи“ и „На работа“ по едно и също време. Ресурсът с най-голям "
 "приоритет ще получава събитията. (вижте по-долу)"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Роля:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Настройки на стаята"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Стая:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Запазване на _паролата (несигурно)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Запазване на _положението и размера на списъка с контакти и прозорците за "
 "разговор"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Запазване на файла като..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Запазване на история на _разговорите за всички контакти"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Запазване на паро_ла"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Search"
 msgstr "_Търсене"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "_Изпращане"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Изпращане на файл"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Изпращане на _еднократно съобщение"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Изпращане на _файл"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "_Ново съобщение..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Изпращане на пакети за поддържане на връзката"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Изпращане на съобщение"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Изпращане на съобщението и затваряне на прозореца"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 msgid "Sends a message to currently connected users to this server"
 msgstr ""
 "Изпраща съобщение на всички потребители, свързани със сървъра в момента"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Сървър:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Функционалности на сървърите"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Настройване на MOTD"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Настройване на съобщение за деня"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Избор на _аватар"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Настройване на аватар при свързване"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Настройване на съобщение за деня"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Показване на всички _чакащи събития"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Показване на изкл_ючените контакти"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Показване на спис_ъка"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Показване на _XML конзола"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Показване само в спис_ъка"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Shows a list of file transfers between you and other"
 msgstr "Показва списък с файловите трансфери между двата контакта"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "_Свързване"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "Изкл_ючване"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Подреждане на контактите по състояние"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "_Състояние"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Започване на _разговор"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Щат:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Състояние"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Съобщение за състояние:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Състояние:"
@@ -3104,25 +3144,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Син_хронизиране на състоянието на акаунта с общото състояние"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Тема:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "_Цвят на текста"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "_Шрифт на текста"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "Автоматично съобщение за състояние при „Отсъствам“"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "Автоматично съобщение за състояние при „Не съм на разположение“"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Тема:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3148,50 +3189,56 @@ msgid "Type:"
 msgstr "Тип:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Подчертано"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "Актуализиране на MOTD"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Актуализиране на съобщението за деня"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Актуализиране на съобщението за деня"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Използване на _SSL (извън употреба)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "Използване на _набор икони на транспортите"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Използване на удостоверяване"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Използване на различен хост/порт"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "списък с файлови трансфери"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Икона в областта за уведомяване"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Уведомяване чрез изскачащ прозорец при завършване на файловия трансфер"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3204,21 +3251,21 @@ msgstr ""
 "събития за съобщения възникват само ако са съобщения от контакт, с който не "
 "говорите в момента."
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "При получаване на ново събитие"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Работа"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3226,415 +3273,454 @@ msgstr ""
 "Трябва да имате акаунт, за да се свържете с\n"
 "Jabber сървър."
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Вашия JID:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Действия"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "_Добавяне на контакт..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "Добавяне към _списъка..."
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Администратор"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Администратор"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "На_преднали"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "След времето:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Упълномощаване"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "_Фон:"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Забраняване на достъпа"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Преди времето:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "_Добавяне на тази стая към отметките"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "Интернет _браузър:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Отказ"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "_Компактен изглед (Alt+C)"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Ръководства"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "Копиране на _JID/Е-поща"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Копиране на адреса на връзката"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Отказване"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Откриване на услуги"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Откриване на услуги..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_ЧЗВ"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Файлов мениджър:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Филтър:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Приключване"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Шрифт:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "_Стая"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Помощ"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "_Осветяване на неправилно изписаните думи"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_История"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Икона в областта за уведомяване"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Входящо съобщение:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "_Влизане в нова стая..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "_Изритване"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "_Запазване на разговорите"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "Запазване на промените на _състоянията на контактите"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "_Пощенска програма:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Член"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "_Смесване на акаунти"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Съобщение"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "Пром_яна"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "_Промяна на акаунт..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Име: "
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Никога"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "_Уведомяване"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомяване при завършване на файловия трансфер"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_Да"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "_Действия"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "_Свързани потребители"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Отваряне на пощенската програма"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Отваряне на връзката в браузър"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Отваряне..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Изходящо съобщение:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "Со_бственик"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Парола:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "П_ауза"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Плейър:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Показване"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "По_рт:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Настройки"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Състояние"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Публикуване"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Изход"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Премахване"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "_Премахване от списъка"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "_Преименуване"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Отговор"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Възстановяване на стандартните цветове"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Извличане"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Парола:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Търсене"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "_Изпращане"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "Изпра_щане и затваряне"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "_Изпращане на частно съобщение"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "_Изпращане на съобщение от сървъра"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "_Изпращане на еднократно съобщение"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "С_ървър:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Подреждане на контактите по състояние"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "_Започване на разговор"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Състояние"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Съобщение за състояние:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Записване"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Записване"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+msgid "_URL:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Използване на сървър-посредник"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "И_ме на потребител:"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Глас"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "_XML конзола..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "списък с файлови трансфери"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "минути"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: %s не може да бъде отворен за четене"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Грешка при четене на файл:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Грешка при анализиране на файл:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Неуспех при запис на %s. Поддръжката за управление на сесиите няма да работи"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Търсене"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Изтриване на MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Търсене"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "създаване на база от данни за разговорите"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3643,36 +3729,36 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Мигриране на записите на разговорите..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Дата"
@@ -3706,75 +3792,81 @@ msgstr "Сегашното състояние е: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Сегашното състояние е: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Съобщение"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Започване на разговор с акаунт „%s“"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Смесени акаунти"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 #, fuzzy
 msgid "Observers"
 msgstr "Сървър"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Не може да влезете в стая, докато сте невидими."
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "_Влизане в нова стая"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Управление на отметките..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "към акаунт „%s“"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "за акаунт „%s“"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "от акаунт „%s“"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Управление на отметките..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_История"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "_Влизане в нова стая"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3782,69 +3874,78 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Изберете ключ за този контакт"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr ""
 "Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
 "roster."
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "Пре_именуване"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "С_вързване"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "Изкл_ючване"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: ../src/roster_window.py:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "Упълномощаването беше прекратено"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "„%s“ винаги ще ви вижда като изключен."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
+"ще ви вижда изключен."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3852,37 +3953,37 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 msgid "I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Необходима е парола"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Въведете парола за GPG ключ за акаунт „%s“"
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Запазване на паролата"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Парола"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Участвате в една или повече стаи"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3890,20 +3991,20 @@ msgstr ""
 "Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
 "сте, че искате да станете „Невидим“?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Jabber акаунт."
 
-#: ../src/roster_window.py:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3911,151 +4012,139 @@ msgstr ""
 "Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
 "историята."
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "От %s в стая %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Изпращане на файл до контакт"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Промяна на съобщението за състояние..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Промяна на съобщението за състояние..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Скрива това меню"
 
-#: ../src/systray.py:264
-msgid "All contacts in this group are offline or have errors"
-msgstr "Всички контакти в тази група са изключени или има грешки"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %d непрочетено съобщение"
 msgstr[1] "Gajim - %d непрочетени съобщения"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - %d непрочетено съобщение"
 msgstr[1] "Gajim - %d непрочетени съобщения"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - %d непрочетено съобщение в стая"
 msgstr[1] "Gajim - %d непрочетени съобщения в стаи"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - %d непрочетено лично съобщение"
 msgstr[1] "Gajim - %d непрочетени лични съобщения"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Роля: "
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Връзка: "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Състояние: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Състояние: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Записване: "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "Стандартен _набор икони за състояние:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Размер: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Тип: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Изтегляне"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Качване"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Размер: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Тип: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Прехвърлени: "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Не е започнал"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Преустановен"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Завършил"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Временно преустановен"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Блокирал"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Прехвърляне"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Тази услуга все още не е отговорила с подробна информация"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4063,33 +4152,33 @@ msgstr ""
 "Тази услуга не можа да отговори с подробна информация.\n"
 "Най-вероятно е остаряла или повредена"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Избор на аватар"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Изображения"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Търсене на %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4097,7 +4186,7 @@ msgstr ""
 "Този контакт се интересува от информацията за вашето състояние, но вие не се "
 "интересувате от неговото"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4105,13 +4194,13 @@ msgstr ""
 "Вие с интересувате от информацията за състоянието на този контакт, но той не "
 "се интересува от вашето"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4119,23 +4208,23 @@ msgstr ""
 "Вие не се интересувате от информацията за състоянието на контакта, както и "
 "той от вашата"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чакате отговора на контакта относно запитването ви за записване"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr "Трябва да сте свързани, за да публикувате визитката."
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "Трябва да сте свързани, за да изтеглите визитката"
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 #, fuzzy
 msgid "Personal details"
 msgstr "Лични данни"
@@ -4179,47 +4268,49 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "На тази машина няма инсталиран D-Bus или липсва модула за Питон"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "Няма наличен session bus"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Използвайте DBus и Notification-Daemon за показване на уведомленията"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Време в минути, след което състоянието да се променя на „Отсъствам“."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Автоматично състояние поради липса на активност"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Време в минути, след което състоянието да се променя на „Не съм на "
 "разположение“."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Автоматично състояние поради липса на активност"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ако е „True“, не се премахват */_. Така *абв* ще е в получер стил, но със "
 "символите * *."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Добавяне на * и [n] към заглавието на списъка?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4227,30 +4318,30 @@ msgstr ""
 "Колко реда от предишния разговор да за запомнят при повторното отваряне на "
 "подпрозорец/прозорец."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колко минути да отделят последните редове от предишния разговор."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr "Изпращане на съобщение при Ctrl+Enter и нов ред с Enter."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Колко реда да се запазват за Ctrl+горна стрелка."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Използване на компактен изглед при отваряне на прозорец"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Използване на компактен изглед при отваряне на прозорец със стая"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4259,31 +4350,31 @@ msgstr ""
 "Или определен адрес съдържащ %s, където %s е думата/фразата, или "
 "'WIKTIONARY', което означава използване на wiktionary."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ако тази опция е избрана, Gajim може да се контролира отдалечено чрез gajim-"
 "remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4291,23 +4382,23 @@ msgstr ""
 "Превъзмогва хоста при файлов трансфер в случай, че се ползва NAT/"
 "пренасочване на портове."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Соред стандарта на IEC KiB = 1024 байта, KB = 1000 байта."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Показване на подпрозорец при един разговор?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Показване на границата на подпрозореца при един разговор?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Показване на бутона за затваряне на подпрозореца?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4315,7 +4406,7 @@ msgstr ""
 "Списък с думи, отделени с точка и запетая, които ще се осветяват при "
 "разговор в стая."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4324,11 +4415,11 @@ msgstr ""
 "администратора на прозорци. Тази настройка е валидна само ако се използва "
 "иконата в областта за уведомяване."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Ако е „True“, Gajim регистрира xmpp:// при всяко стартиране."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4336,7 +4427,7 @@ msgstr ""
 "Ако е „True“, ще се изобразява икона във всеки подпрозорец, съдържащ "
 "непрочетени съобщения. В зависимост от темата иконата може да бъде анимирана."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4344,7 +4435,7 @@ msgstr ""
 "Ако е „True“, ще се показва съобщението за състояние, ако има такова, на "
 "всеки контакт под името му списъка."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4353,7 +4444,7 @@ msgstr ""
 "нямал такъв последния път или пък има остарял кеширан аватар."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4361,20 +4452,20 @@ msgstr ""
 "Ако е „False“, вече няма да виждате реда за състоянието при разговорите, "
 "когато контактът променя състоянието си."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4385,14 +4476,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Спя"
@@ -4462,186 +4564,99 @@ msgstr ""
 "в стаята. (Тази настройка е валидна само ако notify_on_all_muc_messages е "
 "„True“)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "колониална"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "човешка"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "синя"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "опростена"
-
-#: ../src/common/connection.py:68
-#, fuzzy
-msgid "Unable to load idle module"
-msgstr "Неуспех при влизането в стаята"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Неуспех при влизането в стаята"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "Необходима е парола за влизане в тази стая."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Отлъчени сте от тази стая."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Такава стая не съществува."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "Създаването на стаята е ограничено."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Трябва да използвате регистрирания псевдоним."
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Не сте в списъка с членове."
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Предпочитаният псевдоним се използва от друг участник.\n"
-"Изберете друг псевдоним по-долу: "
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-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:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "вече сме записани за %s"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "искане за отписване от %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "вече сме отписани от %s"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Връзката на акаунт „%s“ се разпадна"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "За да продължите да изпращате и получавате съобщения, трябва да се свържете "
 "наново."
 
-#: ../src/common/connection.py:1464
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID-ът %s не е съвместим по RFC и няма да бъде добавен към списъка. "
-"Използвайте инструменти за управление на списъка като http://jru."
-"jabberstudio.org, за да го премахнете."
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Невалидна парола"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Невалидна парола"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не може да се осъществи свързване с „%s“"
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Свързан към сървър %s:%s с %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Проверете връзката или опитайте отново по-късно"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Неуспех при удостоверяването с „%s“"
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 msgid "Please check your login and password for correctness."
 msgstr "Проверете дали името и паролата са правилни."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "Не беше зададена парола за OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "невидим"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "изключен"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "%s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Това съобщение е криптирано]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4650,207 +4665,208 @@ msgstr ""
 "Тема: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Информацията за регистрация на транспорта %s не пристигна навреме."
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
+msgstr ""
+"Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
+"roster."
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Невалиден символ в потребителското име."
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Необходим е адрес на сървъра."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Невалиден символ в името на хоста."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Невалиден символ в ресурса."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Зает"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Зает"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_Не съм на разположение"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Не съм на разположение"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "_Свободен за разговор"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Свободен за разговор"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "На _линия"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "На линия"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Свързване"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "_Отсъствам"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Отсъствам"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "_Изключен"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Изключен"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "Не_видим"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Невидим"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "Неизвестно"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "Има грешки"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "От"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Двустранно"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Записване"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "Не е установен"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Председатели"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Председател"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Участници"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Посетители"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Посетител"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "обръща внимание на разговора"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "прави нещо друго"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "пише съобщение..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "спря да пише съобщение"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "затвори прозореца или подпрозореца"
 
@@ -4860,10 +4876,107 @@ msgstr "затвори прозореца или подпрозореца"
 msgid "error: cannot open %s for reading"
 msgstr "грешка: %s не може да бъде отворен за четене"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "опростена"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "синьозелена"
 
+#~ msgid "Send"
+#~ msgstr "Изпращане"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr "%(nickname)s в стая %(room_name)s ви изпрати ново съобщение."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s ви изпрати ново съобщение."
+
+#, fuzzy
+#~ msgid "GUI Migration failed"
+#~ msgstr "Неуспех при публикуването на визитката"
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr ""
+#~ "Историята на разговорите беше мигрирана успешно към базата от данни."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr ""
+#~ "Ако тази опция е избрана, Gajim ще има и икона в областта за уведомяване."
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Профил и аватар"
+
+#~ msgid "_Online Users"
+#~ msgstr "_Свързани потребители"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Започване на разговор с акаунт „%s“"
+
+#~ msgid "All contacts in this group are offline or have errors"
+#~ msgstr "Всички контакти в тази група са изключени или има грешки"
+
+#~ msgid "Size: "
+#~ msgstr "Размер: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "Няма наличен session bus"
+
+#, fuzzy
+#~ msgid "Unable to load idle module"
+#~ msgstr "Неуспех при влизането в стаята"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Неуспех при влизането в стаята"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Необходима е парола за влизане в тази стая."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Отлъчени сте от тази стая."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Такава стая не съществува."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "Създаването на стаята е ограничено."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Трябва да използвате регистрирания псевдоним."
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Не сте в списъка с членове."
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "Предпочитаният псевдоним се използва от друг участник.\n"
+#~ "Изберете друг псевдоним по-долу: "
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "вече сме записани за %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "искане за отписване от %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "вече сме отписани от %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID-ът %s не е съвместим по RFC и няма да бъде добавен към списъка. "
+#~ "Използвайте инструменти за управление на списъка като http://jru."
+#~ "jabberstudio.org, за да го премахнете."
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr "Информацията за регистрация на транспорта %s не пристигна навреме."
+
 #~ msgid "Sound"
 #~ msgstr "Звук"
 
@@ -4997,9 +5110,6 @@ msgstr "синьозелена"
 #~ msgid "with account "
 #~ msgstr "акаунт: "
 
-#~ msgid "New Message as %s"
-#~ msgstr "Ново съобщение като %s"
-
 #~ msgid "Chat with"
 #~ msgstr "Разговор с"
 
diff --git a/po/cs/LC_MESSAGES/gajim.po b/po/cs/LC_MESSAGES/gajim.po
index b409166e6..9b52c2331 100644
--- a/po/cs/LC_MESSAGES/gajim.po
+++ b/po/cs/LC_MESSAGES/gajim.po
@@ -14,12 +14,12 @@
 # Petr Mensik <pihhan@seznam.cz>, 2005.
 # Pihhan <pihhan@seznam.cz>, 2005.
 #
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2005-12-17 15:11+0100\n"
 "Last-Translator: Pihhan <pihhan@seznam.cz>\n"
 "Language-Team:  <cs@li.org>\n"
@@ -67,7 +67,7 @@ msgid "Hidden"
 msgstr "Skrýté"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -84,82 +84,79 @@ msgstr ""
 "Vlastnost zvýrazňování překlepů nebude použita"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 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/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Rozhovor"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Rozhovor"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Šifrování"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s nerozesílá OpenPGP klíč nebo jste žádný nepřiřadil(a)"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Šifrování zapnuto"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Šifrování vypnuto"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "není v seznamu"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Právě jsi obdržela novou zprávu od \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "Pokud zavřete toto okno a historie je vypnutá, tato zpráva bude ztracena."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Každých %s _minut"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Aktivní"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Událost"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -207,199 +204,212 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP není použitelné na tomto počítači"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "Ke změně jména účtu se musite odpojit."
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Neplatné jméno účtu"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Jméno účtu nemůže být prázdné."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 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:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 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:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
 
-#: ../src/config.py:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Selhalo získání privátního klíče"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 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:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Šifrování"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Není zvolen žádný klíč"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Jméno"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 #, fuzzy
 msgid "Member List"
 msgstr "Č_len"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 #, fuzzy
 msgid "Owner List"
 msgstr "_Vlastník"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Správce"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 #, fuzzy
 msgid "Nick"
 msgstr "Vy_kopnout"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 #, fuzzy
 msgid "Role"
 msgstr "Postavení:"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 #, fuzzy
 msgid "Banning..."
 msgstr "Zakazuji %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Co by jste rád(a) dělal(a)?</b>"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Co by jste rád(a) dělal(a)?</b>"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Co by jste rád(a) dělal(a)?</b>"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Správce"
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Co by jste rád(a) dělal(a)?</b>"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -409,77 +419,87 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "Účet \"%s\" se připojil k serveru"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Pokud jej smažete, připojení bude ztraceno."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Účet \"%s\" se připojil k serveru"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Pokud jej smažete, připojení bude ztraceno."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Nová místnost"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 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:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr "Musíte zadat uživatelské jméno před nastavením tohoto účtu."
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 msgid "You must enter a password for the new account."
 msgstr "Musíte zadat heslo pro nový účet."
 
-#: ../src/config.py:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hesla zadaná v obou políčkách musí být identická."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Neplatné Jabber ID"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -487,19 +507,19 @@ msgstr ""
 "Můžete nastavit rozšířené volby účtu po stisknutí tlačítka rozšířené, nebo "
 "později stisknutím v položce menu Účty v nabídce Úpravy hlavního okna."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Váš účet byl úspěšně vytvořen"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
@@ -558,318 +578,324 @@ msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings chybí na tomto počítači"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Možnosti D-Bus nemohou být použity"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Jméno kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Transporty"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "Ve skupině"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "ID klíče"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Jméno kontaktu"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "Text stavu %s"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Text stavu"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Přednastavené stavy</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Napište nový popis stavu:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Prosím vyplňte údaje kontaktu, který chcete přidat do účtu %s"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplňte údaje o kontaktu, který chcete přidat"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Transporty"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "Neplatný identifikátor uživatele"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Tato služba neobsahuje žádné položky, které je možno prohlížet."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Kontakt už je v Seznamu"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber client"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr "Petr Menšík <pihhan@seznam.cz>"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Žádost o autorizaci pro účet %s od %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 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:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Vstoupit do diskuze z účtu %s"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začít rozhovor z účtu %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Začít rozhovor"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 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:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, 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:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Nová zpráva"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Nová jednoduché zpráva"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Nová soukromá zpráva"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Žádost o přenos souboru"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Chyba přenosu souboru"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Přenos souboru dokončen"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Přenos souboru zastaven"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 msgid "New E-mail"
 msgstr ""
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Žádost o přenos souboru"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Chyba přenosu souboru"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Přenos souboru dokončen"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Přenos souboru zastaven"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "?Group Chat Contact Role:Žádná"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "XML Konzole"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "Pozval(a) %(contact_jid)s do %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Ostatní"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Diskuze"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez spojení nemůžete prohlížet dostupné služby"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery"
@@ -878,11 +904,11 @@ msgstr "Service Discovery"
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Tato služba nebyla nalezena"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -890,176 +916,177 @@ msgstr ""
 "Služba na zadané adrese neexistuje, nebo neodpovídá. Zkontrolujte adresu a "
 "opakujte znovu."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Službu nelze prohlížet"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Tento typ služby neobsahuje žádné položky, které je možné prohlížet."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "pomocí účtu %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Prohlížet"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Tato služba neobsahuje žádné položky, které je možno prohlížet."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Vstoupit"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "_Úpravy"
 
 # FIXME: tohle je blbe prelozene, najit v kontextu a vymyslet lepsi oznaceni
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skenuji %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Uživatelé"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Popis"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Soubor"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Průběh"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Velikost: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Vy"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Odesílatel: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Příjemce: "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Uloženo do: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Přenos soubor dokončen"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Otevřít obsahující složku"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Přenos souboru zrušen"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "Spojení s protistranou se nepodařilo navázat."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Přenos souboru byl ukončen protistranou"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Vyber soubor k odeslání..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Odeslat"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "Ode_slat"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemůže otevřít tento soubor"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Tento soubor je používán jiným procesem."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Tento soubor už existuje"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Co by jste rád(a) dělal(a)?</b>"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s Vám chce poslat soubor:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Uložit jako..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Chcete jej přepsat?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1067,7 +1094,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
@@ -1084,12 +1111,12 @@ msgstr "Soubor: "
 msgid "It is not possible to send empty files"
 msgstr "Není možné posílat prázdné soubory"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Jméno: "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Odesílatel: "
 
@@ -1097,32 +1124,32 @@ msgstr "Odesílatel: "
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Pokračovat"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "zobrazí nápovědu pro konkrétní příkaz"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "příkaz"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "zobraz nápovědu k příkazu"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Zobrazí nebo skryje okno Seznamu"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Otevře okno s další nepřečtenou zprávou"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1130,44 +1157,44 @@ msgstr ""
 "Vytiskne všech kontaktů v Seznamu. Každý kontakt se objeví na samostatném "
 "řádku"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "účet"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "zobraz pouze kontakty zadaného účtu"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše seznam registrovaných účtů"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Změní stav účtu nebo účtů"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "stav"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "zpráva"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "text stavu"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1175,19 +1202,19 @@ msgstr ""
 "změnit stav účtu \"account\". Pokud není uveden, zkuste změnit stav všech "
 "účtů které mají povolenu volbu \"sync with global status\" "
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Zobrazte okno rozhovoru, aby jste mohl(a) poslat zprávu kontaktu"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, se kterým chcete komunikovat"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "pokud uvedeno, kontakt bude vzít ze seznamu kontaktů pro tento účet"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1197,127 +1224,127 @@ msgstr ""
 "volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte "
 "prostě 'OpenPGP key' na ''."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, který obdrží zprávu"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "Tělo zprávy"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "pgp klíč"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "pokud bude uvedeno, zpráva bude zašifrována tímto veřejným klíčem"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Získej detailní informace o kontaktu"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Získej detailní informace o kontaktu"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Nemáte aktivní účet"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Pošle soubor kontaktu"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "soubor"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Cesta k souboru"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Vypíše všechna nastavení a jejich hodnoty"
 
 # FIXME: opravit, pokud je mozne prekladat i key & value
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastaví hodnotu klíče 'key' na hodnotu 'value'"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "klíč=hodnota"
 
 # FIXME: opet
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'klíč' je jméno volby, 'hodnota' je hodnota která se nastavuje"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Smaže položku nastavení"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "klíč"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "jméno volby, která bude smazána"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíše aktuální nastavení do souboru .config"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Odstraní kontakt ze Seznamu"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Přidat kontakt do Seznamu"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Přidá nový kontakt do tohoto účtu."
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vrátí aktuální stav (globální, pokud není uveden účet)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr "Vrátí aktuální stav (globální, pokud není uveden účet)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Chybí parametry \"contact_jid\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1326,16 +1353,16 @@ msgstr ""
 "'%s' není ve vašem Seznamu.\n"
 "Prosím uveďte účet, přes který bude odeslána zpráva."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Nemáte aktivní účet"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Neznámá verze D-Bus: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1344,16 +1371,16 @@ msgstr ""
 "Použití: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Parametry:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s nebyl nalezen"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1362,7 +1389,7 @@ msgstr ""
 "Použití: %s příkaz [parametry]\n"
 "Příkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1371,33 +1398,33 @@ msgstr ""
 "Parametry \"%s\" nebyl uveden. \n"
 "Napište \"%s help %s\" pro více informací"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim vyžaduje X server k běhu. Končím..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim vyžaduje PyGTK 2.6 nebo novější"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim vyžaduje PyGTK 2.6 nebo novější. Končím..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim potřebuje GTK 2.6 nebo novější"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim vyžaduje GTK 2.6 nebo novější. Končím..."
 
 # FIXME: runtime je jak?
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime vyžaduje podporu libglade"
 
 # FIXME: runtime?
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1406,84 +1433,108 @@ msgstr ""
 "Prosím odinstalujte stávající GTK+ runtime a nainstalujte poslední stabilní "
 "verzi z %s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Ujistěte se prosím, že gtk a pygtk ve Vašem systému podporují libglade."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim vyžaduje PySQLite2"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorizace pro %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Chcete přijmout tuto žádost?"
 
-#: ../src/gajim.py:498
-#, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "%(nickname)s v místnosti %(room_name)s Vám poslal(a) novou zprávu."
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Kontakt se přihlásil"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s Vám poslal(a) novou zprávu."
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Kontakt se odhlásil"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Nová soukromá zpráva"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nová jednoduché zpráva"
+
+#: ../src/gajim.py:610
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr ""
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "chyba při odesílání"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" Vás autorizoval k zobrazení jeho stavu."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
 # FIXME: hrozna veta
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Uvidíte jej nebo ji vždy jako odpojenou."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt s \"%s\" nebyl navázán"
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Ověřte spojení nebo zkuste později."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s je nyní %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Vaše heslo je neplatné"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálně jste připojen(a) bez vašeho OpenPGP klíče."
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
@@ -1491,51 +1542,46 @@ msgstr[0] "Máte nepřečtené zprávy"
 msgstr[1] "Máte nepřečtené zprávy"
 msgstr[2] "Máte nepřečtené zprávy"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vám chce poslat soubor."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Soubor %(filename)s od %(name)s byl úspěsně přijat."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Soubor %(filename)s byl uspěšně odeslán %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "publikování vizitky bylo úspěšné"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Vaše osobní údaje byly úspěšně publikovány."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "publikování vizitky se nezdařilo"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1545,160 +1591,144 @@ msgstr ""
 # FIXME: jaky je rozdil mezi settings a preferences?
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: ../src/gajim.py:1719
-#, fuzzy
-msgid "GUI Migration failed"
-msgstr "publikování vizitky se nezdařilo"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "Historie byla úspěšně převedena do databáze."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Podpora Správce sezení není dostupná (schází gnome.ui modul)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Převádím historii..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Prosím vyčkejte až bude historie převedena..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Téma"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "jméno tématu"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Nemůžete smazat právě používané téma"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Vyberte prosím napřed jiné téma."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Začít rozhovor"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Začít rozhovor"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, 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/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Diskuze"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Diskuze"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Místnost nemá žádné téma"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s byli vyhozeni od %(who)s: %(reason)s"
 
 # FIXME: preklad pro ban? zabanovani je hnusne
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s byl zakázán od %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s se přejmenoval na %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s je nyní %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Přezdívka nenalezena: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozval(a) %(contact_jid)s do %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nevypadá jako platné JID"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "Neznámý příkaz: /%s (pokud to chcete odeslat, napište před to /say)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Příkazy: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1710,7 +1740,7 @@ msgstr ""
 "Přezdívka nájemníka může být nahrazena, pokud neobsahuje \"@\". Pokud je JID "
 "právě v místnosti, bude vyhozen. NEpodporuje mezery v přezdívce."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1718,12 +1748,12 @@ msgstr ""
 "Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému "
 "nájemníkovi."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Použití: /%s, smaže zprávy v okně."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1732,12 +1762,12 @@ msgstr ""
 "Použití: /%s [důvod], uzavře toto okno nebo záložku, a vypíše důvod, pokud "
 "byl uveden."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Použití: /%s, nastaví okno diskuze do kompaktního režimu."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1746,7 +1776,7 @@ msgstr ""
 "Použití: /%s <JID> [důvod], pozve JID do této místnosti, případně s uvedeným "
 "důvodem."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1755,7 +1785,7 @@ msgstr ""
 "Použití: /%s <místnost>@<server>[/přezdívka], nabízí vstup do místnosti "
 "místnost@server, případně s uvedenou přezdívkou."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1765,7 +1795,7 @@ msgstr ""
 "Použití: /%s <přezdívka> [důvod], odstraní nájemníka určeného přezdívkou z "
 "místnosti a případně zobrazí důvod. NEpodporuje mezery v přezdívce."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1774,7 +1804,7 @@ msgstr ""
 "Použití: /%s <akce>, pošle akci do aktuální místnosti. Použijte třetí osobu "
 "(například /%s explodoval.)"
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1783,87 +1813,87 @@ msgstr ""
 "Použití: /%s <přezdívka> [zpráva], otevře okno se soukromou zprávou a odešle "
 "zprávu nájemníkovi určeném přezdívkou."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Použití: /%s <přezdívka>, změní Vaši přezdívku v aktuální místnosti"
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Použití: /%s [téma], zobrazí nebo aktualizuje téma v aktuální místnosti."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Použití: /%s <zpráva>, odešle zprávu bez hledání jiných příkazů."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Žádná další nápověda pro /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Jste si jistý(á), že chcete opustit místnost \"%s\"?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Pokud zavřete toto okno, budete odpojen(a) z této místnosti."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "Příště _nezobrazovat"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Měním Téma"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Prosím zadejte nové téma:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Měním přezdívku"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím zadejte novou přezdívku, kterou chcete používat:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavena"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "Místnost \"%s\" už je ve Vašich záložkách."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Záložka byla úspěšně přidána"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Můžete spravovat Vaše záložky přes menu Akce ve vašem Seznamu."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
@@ -1910,111 +1940,120 @@ msgstr "<b>Editor rozšířeného nastavení</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Aplikace</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Vlastní</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Popis</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Formát řádky</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Přizpůsobení rozhraní</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Provoz Jabberu</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Příslušenství</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Osobní údaje</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Prosím zvolte z následujících možností:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Prosím vyplňte údaje pro Váš nový účet</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Prosím zvolte z následujících možností:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Přednastavené stavy</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Vlastnosti</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Nastavení</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Zvuky</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Napište nový popis stavu:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Vizuální upozornění</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Co by jste rád(a) dělal(a)?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>Vstup XML</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Seznam aktivních, dokončených a zastavených přenosů souborů"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "Úč_ty"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Po přezdívce:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "O aplikaci"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Přijmout"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Účet"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2026,52 +2065,44 @@ msgstr ""
 "Kontakt\n"
 "Titulek"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Úprava účtu"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Účty"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "_Další akce"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Přidat nový kontakt"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Vizuální upozornění</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Přidat _kontakt"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Adresa"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Rozšířené"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Editor rozšířeného nastavení"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Po přezdívce:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Po čase:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2081,56 +2112,56 @@ msgstr ""
 "Pouze píšu zprávu\n"
 "Vypnuto"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Povolit odeslání informace o _OS"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Dovol mu/jí vidět můj stav"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Povolit popup/upozornění pokud jsem _pryč/nedostupný/nerušit/neviditelný"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "Známý také jako iChat styl"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Ptej se na stav při:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Požádat o zobrazení je(jí)ho stavu"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Žádá:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Přiřadit Open_PGP klíč"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorizovat kontakt, aby věděl kdy jste připojen(a)"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "_Automaticky pryč po:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Automaticky _nedostupný po:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Automaticky vstoupit"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2142,15 +2173,15 @@ msgstr ""
 "Vždy použít výchozí aplikace z KDE\n"
 "Vlastní"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Automaticky autorizovat kontakt"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Automaticky se znovu připojit při ztrátě spojení"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2163,13 +2194,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Před přezdívkou:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Před časem:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Před přezdívkou:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2284,133 +2312,137 @@ msgid "Company:"
 msgstr "Společnost:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Nastavit _místnost"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Připojit když stisknu Dokončit"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Spojení"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Informace o kontaktu"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "_Informace o kontaktu"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "Historie konverzace"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "Země:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "_Výchozí ikony stavů:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Smazat MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Smazat Zprávu dne"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Smaže zprávu dne"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Odmítnout"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Odmítne autorizaci od kontaktu, takže nebude vidět kdy jste připojen(a)"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Oddělení:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Zobrazovat avatary kontaktů v Seznamu"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Zobrazovat popis stavu kontaktů v Seznamu"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "Každých 5 _minut"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Upravit skupiny"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Upravit osobní informace..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Upravit _skupiny"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Spravuj smajlíky"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Povolit"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Zadejte znovu pro ověření:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Zadejte heslo:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Události"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "Každých 5 _minut"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Další adresa:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Rodina:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Přenosy souborů"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "_Přenosy souborů"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Správce souborů:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Filtr:"
@@ -2420,39 +2452,35 @@ msgid "Font style:"
 msgstr "Staly písma:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Písmo:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Zakaž mu/jí vidět můj stav"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Formát: RRRR-MM-DD"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Často kladené dotazy - FAQ (online)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "_Jdi"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Úprava témat Gajimu"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2462,7 +2490,7 @@ msgstr ""
 "Gajim umí ohlašovat svoji schopnost posílat a přijímat meta-informace "
 "vztahující se k rozhovoru"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2470,7 +2498,7 @@ 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:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2478,7 +2506,7 @@ msgid ""
 msgstr ""
 "Gajim Vás upozorní o nové zprávě pomocí popupu v pravém dolním rohu obrazovky"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2486,7 +2514,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:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2494,25 +2522,33 @@ msgstr ""
 "Gajim Vás upozorní o přávě odpojených kontaktech pomocí popupu v pravém "
 "dolním rohu obrazovky"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim pouze změní ikonu kontaktu, který odeslal novou zprávu"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Průvodce vytváření účtu"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Obecné"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Křestní:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Žádný"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Skupina:"
@@ -2560,18 +2596,24 @@ 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:170
-msgid "If checked, Gajim will also have a trayicon"
-msgstr "Pokud bude zaškrtnuto, Gajim bude mít také ikonu v traybaru"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
+msgstr ""
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat popisy stavů kontaktů pod jménem v "
 "okně Seznamu"
@@ -2652,8 +2694,9 @@ msgstr ""
 "jako by byly z jednoho účtu"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Příchozí zpráva:"
+#, fuzzy
+msgid "Inactive"
+msgstr "Aktivní"
 
 #. 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:185
@@ -2689,39 +2732,57 @@ msgid "Location"
 msgstr "Poloha"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Zpráva"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Spravovat..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Spravuj účty"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Spravuj záložky"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Spravuj profily Proxy"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Spravovat..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Střední:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "Mo_derátor"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Více"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Jméno:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2729,109 +2790,105 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Přezdívka"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Žádný"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Upozorni mě na kontakty které se: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "Při každé _zprávě"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 #, fuzzy
 msgid "One message _window:"
 msgstr "Odeslat zprávu a zavřít okno"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Otevřít..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Odchozí zpráva:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "He_slo:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Heslo"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Pozastaveno"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Osobní údaje"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Telefon:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Přehrávat _zvuky"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Pozice:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "PSČ:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Nastavení"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Titul:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "text stavu"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Čas tisku:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Priori_ta:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2841,59 +2898,51 @@ msgstr ""
 "serveru, pokud je připojeno více klientů přes stejný účet. Zprávu obdrží "
 "klient s vyšší prioritou"
 
-#: ../src/gtkgui.glade.h:237
-msgid "Profile, Avatar"
-msgstr "Profil, Avatar"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Nedávno:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Zaregistrovat"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Odstranit účet _pouze z Gajimu"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Odstranit účet z Gajimu i ze _serveru"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Odstranit přenos souboru ze výpisu."
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr "Odstraní dokončené, zrušené nebo přenosy které selhaly, z výpisu"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Odpovědět na tuto zprávu"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Vrátit k výchozím barvám"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "Zd_roj: "
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2907,168 +2956,160 @@ msgstr ""
 "'Práce' zároveň. Zdroj, který má nejvyšší prioritu obdrží zprávy. (více "
 "následuje)"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Zdroj:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Postavení:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Nastavení místnosti"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Místnost:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Uložit _heslo (nebezpečné)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr "Uložit _pozici a velikost pro seznam a okna rozhovorů"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Uložit jako..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Uložit _historii pro všechny kontakty"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Uložit _heslo"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Search"
 msgstr "_Najít"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "O_deslat"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Odeslat Soubor"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Odeslat jednoduchou _zprávu"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Odeslat _Soubor"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Pošli _Novou zprávu..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Odesílat keep-alive pakety"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Odeslat zprávu"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Odeslat zprávu a zavřít okno"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 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:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Vlastnosti serveru"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Nastavit MOTD"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Nastavit Zprávu dne"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Nastavit _Avatara"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Nastavit avatara když se připojuji"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Nastaví Zprávu dne"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Zobrazit všechny čekající _události"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Zobrazit _odpojené kontakty"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Zobrazit _Seznam"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Zobrazit _XML konzoli"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Zobrazit pouze v _Seznamu"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 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:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "_Přihlásí"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "_Odhlásí"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Seřadit podle stavu"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "S_tav"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Začít _rozhovor"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Stav:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Stav"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Stav:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Stav:"
@@ -3099,25 +3140,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Synch_ronizovat stav účtu s globálním stavem"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Téma:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "_Barva textu:"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "Písmo textu:"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "Text stavu automaticky pryč"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "Text stavu nedostupný"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Téma:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3143,50 +3185,56 @@ msgid "Type:"
 msgstr "Typ:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Podtržení"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "Upravit MOTD"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Upravit Zprávu dne"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Upraví Zprávu dne"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Použít _SSL (staré)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "Používej ikony _transportů"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Použij autentifikaci"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Použít vlastní jméno počítače/port"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "výpis přenosů souborů"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Ikona v systrayi (jinak řečeno v oznamovací oblasti)"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "Uživatel:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Zobraz upozornění, až bude přenos souboru dokončen"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3198,435 +3246,474 @@ msgstr ""
 "následující metody Vás mohou upozornit. Poznámka: Údálost přijetí nový "
 "zprávy nastane pouze tehdy, pokud je od kontaktu, se kterým už nehovoříte"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Když je přijata nová zpráva"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Práce"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
 msgstr "Potřebujete mít účet pro připojení k síti Jabber."
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Vaše JID:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Akce"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "Přid_at kontakt..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "Přid_at do Seznamu"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Správce"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Správce"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "_Rozšířené"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Po čase:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Autorizuj"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "_Pozadí:"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Zakázat"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Před časem:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "_Přidej do záložek"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Prohlížeč:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "_Zjednodušený pohled    Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "_Kopírovat JID/Emailovou adresu"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Kopírovat odkaz"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "O_dmítnout"
 
 # FIXME: chtelo by to cesky vyraz pro service discovery
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Prohlížet služby"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Procházet služby..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Správce souborů:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Filtr:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Dokončit"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Písmo:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "_Diskuze"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "Zvýrazňovat _slova s překlepy"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_Historie"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Ikona v systrayi (jinak řečeno v oznamovací oblasti)"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovat události od kontaktů mimo můj Seznam"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Příchozí zpráva:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "_Vstoupit do nové místnosti..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "Vy_kopnout"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "_Zaznamenat historii konverzace"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "Zaznamenávat změny _stavu kontaktů"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "E-_mailový klient:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "Č_len"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "_Spojit účty"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Zpráva"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Upravit"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "Upravit úč_et..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Jméno: "
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Nikdy"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "_Upozornit mě"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Upozornit mě po dokončení přenosu souboru"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "_Akce účastníků"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "_Připojení uživatelé"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Otevři Emailový editor"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Otevřít v prohlížeči"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Otevřít..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Odchozí zpráva:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "_Vlastník"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Pauza"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Přehrávač:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "Zobrazit o_kno se zprávou"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Nastavení"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Zveřejnit"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Konec"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "Odst_ranit"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "Odst_ranit ze Seznamu"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Vrátit k výchozím barvám"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Získat"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Heslo:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Najít"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "Ode_slat"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "Ode_slat a zavřít"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "_Odeslat soukromou zprávu"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "Ode_slat zprávu serveru"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "Ode_slat jednoduchou zprávu"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Seřadit podle stavu"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "_Začít rozhovor"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Stav"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Stav:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Žádat autorizaci"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Autorizace"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+msgid "_URL:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Používat proxy"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "_Uživatel:"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Hlas"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "_XML konzole..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "výpis přenosů souborů"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "minut"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Chyba při čtení souboru:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Chyba parsování souboru:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Nemůžu zapsat do %s. Podpora správy sezení nebude fungovat"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Najít"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Smazat MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Najít"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "vytvářím databázi historie"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3635,38 +3722,38 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Převádím historii..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Datum"
@@ -3700,75 +3787,81 @@ msgstr "Status je nyní %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status je nyní %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Zpráva"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Začít rozhovor z účtu %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 #, fuzzy
 msgid "Observers"
 msgstr "Server"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "_Vstoupit do nové místnosti"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Spravovat záložky..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "do účtu %s"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "pomocí účtu %s"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "pomocí účtu %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Spravovat záložky..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "pro účet %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_Historie"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "_Vstoupit do nové místnosti"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3776,68 +3869,77 @@ msgstr ""
 "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
 "transportu."
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 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:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "Přejme_novat"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "Přih_lásit"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "_Odhlásit"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš status."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, 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:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "Autorizace byla zrušena"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nyní Vás \"%s\" uvidí vždy jako odpojeného."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, 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:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
+"odpojeného."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3845,37 +3947,37 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 msgid "I want this contact to know my status after removal"
 msgstr "Chci aby tento kontakt věděl o mém stavu i po odstranění"
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Zadej heslo GPG klíče pro účet %s"
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Uložit heslo"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Heslo"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3883,20 +3985,20 @@ msgstr ""
 "Změna vašeho stavu na neviditelný způsobí odpojení od těchto diskuzí. Jste "
 "si jistý(á), že se chcete stát neviditelným(ou)?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 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:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3904,35 +4006,31 @@ msgstr ""
 "Zprávy bude možné číst později pouze v případě, budete-li mít povolenou "
 "historii."
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Od %s v místnosti %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Pošle soubor kontaktu"
 
 # FIXME: nejak divne, asi spatne prelozene
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Změnit popis stavu..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Změnit popis stavu..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Skryje toto menu"
 
-#: ../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"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
@@ -3940,7 +4038,7 @@ msgstr[0] "Gajim - %d nepřečtenou zprávu"
 msgstr[1] "Gajim - %d nepřečtené zprávy"
 msgstr[2] "Gajim - %d nepřečtených zpráv"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
@@ -3948,7 +4046,7 @@ msgstr[0] "Gajim - %d nepřečtenou prosté zprávu"
 msgstr[1] "Gajim - %d nepřečtené prosté zprávy"
 msgstr[2] "Gajim - %d nepřečtených zpráv"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
@@ -3956,7 +4054,7 @@ msgstr[0] "Gajim - %d nepřečtenou zprávu z diskuze"
 msgstr[1] "Gajim - %d nepřečtené zprávy z diskuze"
 msgstr[2] "Gajim - %d nepřečtených zpráv"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
@@ -3964,96 +4062,88 @@ msgstr[0] "Gajim - %d nepřečtenou soukromou zprávu"
 msgstr[1] "Gajim - %d nepřečtené soukromé zprávy"
 msgstr[2] "Gajim - %d nepřečtených zpráv"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Role:"
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Přidružení:"
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Stav: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Zdroj: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Stav: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Autorizace: "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "_Výchozí ikony stavů:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Velikost: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Typ: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Velikost: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Typ: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Přeneseno: "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Nespuštěno"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Pozastaveno"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Stagnuje"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Přenáším"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Tato služba dosud neodpověděla s detaily"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4061,72 +4151,72 @@ msgstr ""
 "Tato služba nemůže odpovědět s více podrobnostmi.\n"
 "Pravděpodobně je stará nebo rozbitá"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Vyber Avatara"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Obrázky"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "?Client:Neznámý"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámý"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Prohlížení %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "Tento kontakt zajímá Váš stav, ale Vy se nezajímate o jeho stav"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "Vy se zajímáte o stav kontaktu, ale on se nezajímá o Váš stav"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Vy i kontakt se zajímáte o stav toho druhého"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Vy ani kontakt se nezajímáte o stav toho druhého"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekáte na odpověď kontaktu na vaši žádost o autorizaci"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr "Bez opětovného připojení nemůžete zveřejnit Vaše osobní údaje."
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "Bez opětovného připojení nemůžete získat Vaše osobní údaje."
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 #, fuzzy
 msgid "Personal details"
 msgstr "Osobní údaje"
@@ -4169,44 +4259,46 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus není přítomna na tohto stroji nebo modul pythonu chybí"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "Rozhraní (bus) sezení není dostupné"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Používej DBus a Notifikačního démona k zobrazování notifikací"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na pryč."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Pryč jako výsledek nečinnosti"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na nedostupný."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Nedostupný jako výsledek nečinnosti"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Pokud zapnuto, nemažte */_ . Potom *abc* bude tučně ale s * * neodstraněnými."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Přidat * a [n] k titulku Seznamu?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4214,11 +4306,11 @@ msgstr ""
 "Jak moc řádků si pamatovat z předchozího rozhovoru, když je okno/záložka "
 "rozhovoru znovu otevřena."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Kolik minut by měly řádky z předchozího rozhovoru zůstat."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4226,20 +4318,20 @@ msgstr ""
 "Odeslat zprávu při Ctrl+Enter a při Enter přejít na nový řádek (výchozí "
 "chování klienta Mirabilis ICQ)."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kolik řádků uložit pro Ctrl+Šipka nahoru."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Použít kompaktní zobrazení když se otevírá okno rozhovoru"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Použít kompaktní zobrazení když se otevírá okno diskuze"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4248,29 +4340,29 @@ msgstr ""
 "Buď vlastní url s %s v těle, kde %s je slovo nebo fráze, nebo 'WIKTIONARY', "
 "která znamená že se použije wiktionary."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Pokud zaškrtnuta, Gajim může být ovládán vzdáleně pomocí gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ptát se před zavřením oken/záložek diskuzí."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Ptát se před zavřením oken/záložek diskuzí."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Ptát se před zavřením oken/záložek diskuzí."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4278,29 +4370,29 @@ msgstr ""
 "Nahradí počítač ze kterého odesíláte v případě překladu adres nebo "
 "přesměrování portu."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard říká KiB = 1024 bytů, KB = 1000 bytů."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Zobrazit záložku při jediném rozhovoru?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Zobrazit okraj záložky při jediném rozhovoru?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Zobrazit tlačitko zavřít v záložce?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr "Středníkem oddělený seznam slov, které budou zvýrazněny v diskuzích."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4308,13 +4400,13 @@ msgstr ""
 "Pokud zapnuto, ukonči Gajim když bude stisknuto tlačítko X v titulku okna. "
 "Toto nastavení se použije pouze tehdy, pokud je použita ikona v trayi."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr ""
 "Pokud zapnuto, Gajim se zaregistruje jako obsluha xmpp:// při každém "
 "spuštění."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4322,7 +4414,7 @@ msgstr ""
 "Pokud zapnuto, Gajim zobrazí ikonu v každé záložce obsahující nepřečtené "
 "zprávy. V závislosti na tématu, tato ikona může být animovaná."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4330,7 +4422,7 @@ msgstr ""
 "Pokud zapnuto, Gajim zobrazí popis stavu, pokud není prázdný, pro každý "
 "kontakt pod jménem v okně Seznamu"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4339,7 +4431,7 @@ msgstr ""
 "naposledy avatara nebo kterého uložený je příliš starý."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4347,20 +4439,20 @@ msgstr ""
 "Pokud vypnuto, nebudete vidět řádku se stavem v rozhovorech, když kontakt "
 "změní svůj stav."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4371,14 +4463,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Spím"
@@ -4447,183 +4550,98 @@ msgstr ""
 "Zvuk, který bude přehrán při každé příchozí zprávě diskuze. (Tato volba se "
 "bere v úvahu pouze tehdy, je-li zapnuto notify_on_all_muc_messages)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "zelený"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "potraviny"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "člověk"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "mariňák"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "prostý"
-
-#: ../src/common/connection.py:68
-#, fuzzy
-msgid "Unable to load idle module"
-msgstr "Nelze vstoupit do místnosti"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Nelze vstoupit do místnosti"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "Pro vstup do této místnosti je vyžadováno heslo."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Je Vám zakázán přístup do této místnosti."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Taková místnost neexistuje."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "Vytváření místností je zakázané."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Vaše zaregistrovaná přezdívka musí být použita."
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Nejste v seznamu členů."
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Vaše zamýšlená přezdívka už je použitá nebo zaregistrovaná někým jiným.\n"
-"Prosím uveďte níže jinou přezdívku:"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-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:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "jsme registrování k %s"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "žádost o zrušení autorizace od %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "autorizace zrušena od %s"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojení s účtem \"%s\" bylo ztraceno"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 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:1464
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"Jid %s neodpovídá RFC. Nebude přidána do vašeho Seznamu. Použijte nástroje "
-"na správu Seznamu jako například  http://jru.jabberstudio.org/ k jeho "
-"odstranění"
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Neplatné heslo"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Neplatné heslo"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Připojen k server %s: %s s %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Ověřte připojení nebo zkuste později"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 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:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP heslo nebylo zadáno"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, 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:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "neviditelný"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "odpojen"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Jsem %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Tato zpráva je zašifrovaná]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4632,207 +4650,206 @@ msgstr ""
 "Předmět: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registrační údaje pro trasport %s nedorazily včas"
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
+msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Neplatný znak v uživatelském jméně."
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Je potřeba adresa serveru."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Neplatný znak v hostname."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Neplatný znak ve zdroji."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Nerušit"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Nerušit"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "Ne_dostupný"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Nedostupný"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "_Ukecaný"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Ukecaný"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "Přip_ojen"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Připojen"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "_Pryč"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Pryč"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "_Odpojen"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Odpojen"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "Ne_viditelný"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Neviditelný"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Neznámý"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "stav"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Žádná"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "Příjemce"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "Odesílatel"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Obojí"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Žádná"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Žádat autorizaci"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Moderátoři"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Návštěvníci"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Návštěvník"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "věnuje pozornost rozhovoru"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "dělá něco jiného"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "píše zprávu..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "pozastavil(a) psaní zprávy"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "zavřel(a) okno zprávy"
 
@@ -4842,10 +4859,105 @@ msgstr "zavřel(a) okno zprávy"
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nemůžu otevřít %s pro čtení"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "prostý"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "azurová"
 
+#~ msgid "Send"
+#~ msgstr "Odeslat"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr "%(nickname)s v místnosti %(room_name)s Vám poslal(a) novou zprávu."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s Vám poslal(a) novou zprávu."
+
+#, fuzzy
+#~ msgid "GUI Migration failed"
+#~ msgstr "publikování vizitky se nezdařilo"
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "Historie byla úspěšně převedena do databáze."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr "Pokud bude zaškrtnuto, Gajim bude mít také ikonu v traybaru"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Profil, Avatar"
+
+#~ msgid "_Online Users"
+#~ msgstr "_Připojení uživatelé"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Začít rozhovor z účtu %s"
+
+#~ 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"
+
+#~ msgid "Size: "
+#~ msgstr "Velikost: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "Rozhraní (bus) sezení není dostupné"
+
+#, fuzzy
+#~ msgid "Unable to load idle module"
+#~ msgstr "Nelze vstoupit do místnosti"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Nelze vstoupit do místnosti"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Pro vstup do této místnosti je vyžadováno heslo."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Je Vám zakázán přístup do této místnosti."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Taková místnost neexistuje."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "Vytváření místností je zakázané."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Vaše zaregistrovaná přezdívka musí být použita."
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Nejste v seznamu členů."
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "Vaše zamýšlená přezdívka už je použitá nebo zaregistrovaná někým jiným.\n"
+#~ "Prosím uveďte níže jinou přezdívku:"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "jsme registrování k %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "žádost o zrušení autorizace od %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "autorizace zrušena od %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "Jid %s neodpovídá RFC. Nebude přidána do vašeho Seznamu. Použijte "
+#~ "nástroje na správu Seznamu jako například  http://jru.jabberstudio.org/ k "
+#~ "jeho odstranění"
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr "Registrační údaje pro trasport %s nedorazily včas"
+
 #~ msgid "Sound"
 #~ msgstr "Zvuk"
 
diff --git a/po/de/LC_MESSAGES/gajim.po b/po/de/LC_MESSAGES/gajim.po
index 20f2a3396..b6a1ca4e8 100644
--- a/po/de/LC_MESSAGES/gajim.po
+++ b/po/de/LC_MESSAGES/gajim.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the gajim package.
 # Fridtjof Busse <fridtjof@fbunet.de>, 2005.
 #
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2005-12-08 09:38+0100\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
@@ -52,7 +52,7 @@ msgid "Hidden"
 msgstr "Versteckt"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -69,63 +69,60 @@ msgstr ""
 "Falschgeschriebene Wörter werden nicht hervorgehoben"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 msgid "Your message can not be sent until you are connected."
 msgstr "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP-Verschlüsselung"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s hat keinen OpenPGP-Schlüssel verbreitet und Sie haben keinen zugewiesen"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Verschlüsselung aktiviert"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Verschlüsselung deaktiviert"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "Nicht in der Liste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -133,20 +130,20 @@ msgstr ""
 "Wenn sie das Fenster schließen und die History abgeschaltet haben, geht die "
 "Nachricht verloren."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Alle %s _Minuten"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -194,202 +191,215 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "Verbindung muss beendet werden, um Kontonamen zu ändern."
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "Verbindung muss beendet werden, um Kontonamen zu ändern."
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Kontoname darf nicht leer sein."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber ID"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID muss in der Form \"user@servername\" sein."
 
-#: ../src/config.py:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "Proxy Port muss eine Portnummer sein."
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Account nicht verfügbar"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 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:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 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:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Holen der geheimen Schlüssel fehlgeschlagen"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 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:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP-Verschlüsselung"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie ihren OpenPGP Schlüssel"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Kein Schlüssel gewählt"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "%s ändern"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 #, fuzzy
 msgid "Member List"
 msgstr "_Mitglied"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 #, fuzzy
 msgid "Owner List"
 msgstr "_Besitzer"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 #, fuzzy
 msgid "Nick"
 msgstr "_Rausschmeißen"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 #, fuzzy
 msgid "Role"
 msgstr "Rolle:"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 #, fuzzy
 msgid "Banning..."
 msgstr "%s verbannen"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Was möchten Sie tun?</b>"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Was möchten Sie tun?</b>"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Was möchten Sie tun?</b>"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Was möchten Sie tun?</b>"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -399,76 +409,86 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "Konto \"%s\" ist mit Server verbunden"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geben Sie ihr Passwort für %s ein"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Konto \"%s\" ist mit Server verbunden"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Neuer Raum"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Dieser Bookmark hat ungültige Daten"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 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:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 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:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 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:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Ungültige Jabber ID"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Der Kontakt befindet sich bereit in Ihrem Roster."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "Account wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -477,19 +497,19 @@ msgstr ""
 "oder durchklicken des Konto-Menüpunktes im Bearbeiten-Menü des Hauptfensters "
 "erreichen."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Kontoname ist schon vergeben"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
@@ -548,163 +568,162 @@ msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Auf diesem Computer fehlen die Python Bibliotheken für D-Bus"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajims D-BUS-Möglichkeiten können nicht genutzt werden"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Kontaktname: <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i> "
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Transports"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "In der Gruppe"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "Schlüssel-ID"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status-Nachricht"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Status-Nachricht"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Voreingestellte Status-Nachrichten</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Geen Sie Ihre neue Statusnachricht ein:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Bitte füllen Sie die Daten aus für den Kontakt, den Sie dem Konto %s "
 "hinzufügen wollen"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bitte geben sie die Daten des neuen Kontakts ein"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Transports"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzer ID"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Kontakt bereits im Roster"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Der Kontakt befindet sich bereit in Ihrem Roster."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "Ein GTK+ Jabber-Client"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr "Ins Deutsche übersetzt von Fridtjof Busse"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abonnement-Anforderung für Konto %s von %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anforderung von %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 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:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Betrete Chatraum mit Account %s"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Betrete Chatraum"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starte Chat mit Account %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -713,158 +732,165 @@ msgstr ""
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Sie müssen verbunden sein, um Ihr Passwort zu ändern"
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Dateitransfer Anfrage"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Dateitransfer-Fehler"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Dateitransfer beendet"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Dateitransfer gestoppt"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Dateitransfer Anfrage"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Dateitransfer-Fehler"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Dateitransfer beendet"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Dateitransfer gestoppt"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "Keine"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Einzelne Nachricht mit Account %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsole für %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "XML Konsole"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s in %(room_jid)s eingeladen"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Wav Dateien"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Andere"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Konferenz"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Sie müssen angemeldet sein um Dienste zu durchsuchen"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Dienste durchsuchen für Konto %s"
@@ -873,11 +899,11 @@ msgstr "Dienste durchsuchen für Konto %s"
 msgid "Service Discovery"
 msgstr "Dienste durchsuchen"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Der Dienst konnte nicht gefunden werden"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -885,175 +911,176 @@ msgstr ""
 "Es existiert keine Dienst an der Adresse, die sie angegeben haben oder er "
 "antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es erneut."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Der Dienst ist nicht durchsuchbar"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Dieser Art von Diest enthält keine durchsuchbaren Objekte."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "mit Konto %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Durchsuche"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Betreten"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "_Ändern"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Durchsuche %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Benutzer"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Datei"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Zeit"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Dateiname: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Größe: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Sie"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Gespeichert in: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Empfänger: "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Absender: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Dateitransfer abgeschlossen"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Öffne Ordner"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Dateitranfer abgebrochen"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "Verbindung zum Teilnehmer kann nicht hergestellt werden"
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Gegenseite hat Dateitransfer gestoppt"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Datei auswählen..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Senden"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "_Senden"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim kann auf diese Datei nicht zugreifen"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Diese Datei wird von einem anderen Prozess verwendet."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Diese Datei existiert schon"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Was möchten Sie tun?</b>"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Datei: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s möchte ihnen eine Datei senden:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Datei speichern unter..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Möchten Sie die Datei überschreiben?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1061,7 +1088,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
@@ -1078,12 +1105,12 @@ msgstr "Datei: "
 msgid "It is not possible to send empty files"
 msgstr "Es nicht möglich, leere Dateien zu versenden"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Absender: "
 
@@ -1091,74 +1118,74 @@ msgstr "Absender: "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Fortsetzen"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "zeige die Hilfe für einen bestimmten Befehl"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "Befehl"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "zeige Hilfe für Befehl"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Zeige Popup-Fenster mit der nächsten ungelesenen Nachricht"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr "Gibt eine Liste aller Kontakte im Roster aus. Eine Zeile je Kontakt"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "Konto"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "zeige nur Kontakte für das gegebene Konto"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Gibt eine Liste registrierter Konten aus"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Ändere den Status eines oder mehrerer Konten"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "Status"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "Eins von: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "Nachricht"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "Statusnachricht"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1167,21 +1194,21 @@ msgstr ""
 "aller Konten für die \"Kontostatus mit globalem Status abgleichen\" "
 "aktiviert ist"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Zeige Chatfenster, so dass eine Nachricht an einen Kontakt gesendet werden "
 "kann"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID des Kontakts mit Sie chatten möchten"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "falls angegeben, wird der Kontakt von der Liste dieses Kontos gewählt"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1191,114 +1218,114 @@ msgstr ""
 "sind optional. Falls nur 'Konto' gesetzt werden soll, ohne OpenGPG-"
 "Schlüssel, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "JID des Kontakts, der die Nachricht empfängt"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "Nachrichteninhalt"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "PGP-Schlüssel"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "falls angegeben, wird die Nachricht damit verschlüsselt"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "falls angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Zeige detaillierte Informationen über Kontakt"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID des Kontakts"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Zeige detaillierte Informationen über Kontakt"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Kein aktives Konto"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Sendet dem Kontakt eine Datei"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "Datei"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Dateipfad"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "Falls angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Zeige alle Einstellung und ihre Werte"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setze Wert von 'Schlüssel' auf 'Wert'."
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'key' ist der Name der Einstellung, 'value' ist der Wert der einzustellende "
 "Wert"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Lösche eine Einstellung"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "Schlüssel"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "Name der zu löschenden Einstellung"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Schreibe die aktuellen Gajim-Einstellung in die Konfigurationsdatei"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Entfernt den Kontakt aus dem Roster"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Fügt Kontakt zum Roster hinzu"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Fügt neuen Kontakt zu diesem Konto hinzu"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Gibt derzeitigen Status zurück·(der globale, außer, es wird ein Account "
 "spezifiziert)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
@@ -1306,16 +1333,16 @@ msgstr ""
 "Gibt derzeitigen Status zurück·(der globale, außer, es wird ein Account "
 "spezifiziert)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Fehlendes Argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1324,16 +1351,16 @@ msgstr ""
 "'%s' ist nicht in ihrer Kontaktliste.\n"
 "Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Kein aktives Konto"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Unbekannte D-BUS-Version: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1342,16 +1369,16 @@ msgstr ""
 "Verwendung: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Parameter:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1360,7 +1387,7 @@ msgstr ""
 "Verwendung: %s Befehl [Argumente]\n"
 "Befehl ist einer von:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1369,38 +1396,38 @@ msgstr ""
 "Argument \"%s\" wurde nicht angegeben. \n"
 "Geben Sie \"%s help %s\" ein für Hilfe"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim benötigt einen laufenden Xserver. Breche ab..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim benötigt PyGTK 2.6 oder höher"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim benötigt PyGTK 2.6 oder höher. Beende..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim benötigt GTK 2.6 oder höher"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim benötigt GTK 2.6+. Breche ab..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtine fehlt libglade-Unterstützung"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 msgstr ""
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -1408,129 +1435,147 @@ msgstr ""
 "Bitte stellen Sie sicher, dass gtk und pygtk auf Ihrem System libglade-"
 "Unterstützung besitzen."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim benötigt PySQLite2 zum Starten"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorisierung für %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Akzeptieren Sie diese Anfrage?"
 
-#: ../src/gajim.py:498
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Kontakt hat sich angemeldet"
+
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Kontakt hat sich abgemeldet"
+
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Neue private Nachricht"
+
+#: ../src/gajim.py:582
 #, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+msgid "%(nickname)s: %(message)s"
 msgstr ""
-"%(nickname)s im Raum %(room_name)s hat Ihnen eine neue Nachricht gesendet."
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s hat Ihnen eine neue Nachricht gesendet."
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Neue einzelne Nachricht"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:610
+#, fuzzy, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Neue Nachricht als %s"
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "Fehler beim Senden"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" hat Sie autorisiert seinen oder ihren Staus zu sehen."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Sie werden den Kontakt ab sofort als offline sehen."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt mit \"%s\" konnte nicht hergestellt werden"
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 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:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s ist jetzt %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Ihre Passphrase ist falsch"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sie wurden ohne ihren GPG-Schlüssel verbunden"
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] "Sie haben %d ungelesene E-Mail-Nachricht"
 msgstr[1] "Sie haben %d ungelesene E-Mail-Nachrichten"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s möchte ihnen eine Datei senden."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Sie haben %(filename)s erfolgreich von %(name)s erhalten."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Dateitransfer %(filename)s von %(name)s wurde gestoppt."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Sie haben%(filename)s erfolgreich an %(name)s gesendet."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Dateitransfer von %(filename)s an %(name)s wurde gestoppt."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "vCard erfolgreich veröffentlicht"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Ihre persönlichen Informationen wurden erfolgreich veröffentlicht."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "vCard Veröffentlichung fehlgeschlagen"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1540,160 +1585,144 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: ../src/gajim.py:1719
-#, fuzzy
-msgid "GUI Migration failed"
-msgstr "vCard Veröffentlichung fehlgeschlagen"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "Logs wurden erfolgreich in die Datenbank migriert."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sitzungsmanagment-Unterstützung nicht verfügbar (fehlendes gnome.ui Modul)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Migriere Logs..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Bitte warten Sie, während die Logs migriert werden..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Thema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "Name des Themas"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Sie können ihr derzeitiges Theme nicht löschen"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Bitte wählen Sie zuerst einen anderen Namen für ihr derzeitiges Theme."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Chat starten"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Chat starten"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, 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/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Gruppenchat"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Gruppenchat"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Dieser Raum hat kein Thema"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s wurde rausgeschmissen: %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s wurde von %(who)s rausgeschmissen: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s wurde von %(who)s gebannt: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s hat den Raum verlassen"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s ist jetzt %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Spitzname nicht gefunden: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s in %(room_jid)s eingeladen"
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s scheint keine gültige JID zu sein"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "Kein Kommando: /%s (wenn Sie dieses Prefix senden wollen mit /say)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandos: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1706,7 +1735,7 @@ msgstr ""
 "\" enthält. Wenn die JIDderzeit im Raum ist, wird er/sie/es ebenfalls "
 "gebannt. Unterstützt KEINE Leerzeichen im Spitznamen."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1714,12 +1743,12 @@ msgstr ""
 "Bedienung: /%s <Spitzname>, öffnet ein privates Chatfenster mit dem "
 "spezifierten Inhaber."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bedienung: /%s, leert das Textfenster."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1728,12 +1757,12 @@ msgstr ""
 "Bedienung: /%s [Grund], schließt das aktuelle Fenster oder Tab, mit Anzeige "
 "eines Grundes falls angegeben."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Bedienung: /%s, stellt das Gruppenchat-Fenster auf Kompaktmodus."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1742,7 +1771,7 @@ msgstr ""
 "Bedienung: /%s <JID> [Grund], lädt die JID in den aktuellen Raum, optional "
 "mit der Angabe eines Grundes."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1751,7 +1780,7 @@ msgstr ""
 "Bedienung: /%s <Raum>@<Server> [/Spitzname], bietet den Beitritt zu "
 "Raum@Server an, optional mit Spitznamen."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1762,7 +1791,7 @@ msgstr ""
 "Raumes und zeigt optional einen Grund. Unterstützt KEINE Leerzeichen im "
 "Spitznamen."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1771,7 +1800,7 @@ msgstr ""
 "Bedienung: /%s <Aktion>, sendet die Aktion im aktuellen Raum. Verwende "
 "dritte Person, z.B. /%s explodiert)."
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1781,18 +1810,18 @@ msgstr ""
 "Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen "
 "Spitznamen."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Bedienung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Raum."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Benutzung: /%s [topic], zeigt oder aktualisiert das derzeitige Raumthema."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -1800,74 +1829,74 @@ msgstr ""
 "Benutzung: /%s <Nachricht>, sendet eine Nachricht ohne andere Befehle zu "
 "beachten."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Keine Hilfe vorhanden für /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Möchten Sie den Raum \"%s\" wirklich verlassen?g"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr ""
 "Wenn Sie dieses Fenster schließen, wird die Verbindung zu diesem Raum "
 "geschlossen."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_Nicht noch einmal fragen"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Bitte bestimmen Sie ein neues Thema"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bitte geben Sie an, welchen Spitznamen Sie verwenden möchten:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Bookmark existiert schon"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "Der Raum \"%s\" ist schon in den Bookmarks."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark wurde erfolgreich hinzugefügt"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Sie können ihre Bookmarks über das Aktionen-Menü in der Kontaktliste "
 "bearbeiten"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rausschmeißen"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -1915,113 +1944,122 @@ msgstr "<b>Erweiterter Konfigurations-Editor</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Anwendungen</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Benutzerdefiniert</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Beschreibung</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Format einer Zeile</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Benutzerdefiniertes Aussehen</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Verkehrsdaten</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Verschiedenes</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persönliche Informationen</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Bitte wählen Sie eine der Optionen:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Bitte geben Sie die Daten für Ihr neues Konto ein</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Bitte wählen Sie eine der Optionen:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Voreingestellte Status-Nachrichten</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Eigenschaften</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Einstellungen</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Klänge</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Geen Sie Ihre neue Statusnachricht ein:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuelle Benachrichtigungen</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Was möchten Sie tun?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Direkteingabe</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr ""
 "Eine Liste der aktiven, fertigen und angehaltenen Dateitransfers von und zu "
 "Ihren Freunden."
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "_Konten"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Nach dem Spitznamen:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "Über"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Konto"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2033,52 +2071,44 @@ msgstr ""
 "Kontakt\n"
 "Banner"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Konto-Änderung"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Konten"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "Er_weiterte Aktionen"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Neuen Kontakt hinzufügen"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Visuelle Benachrichtigungen</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "_Kontakt hinzufügen"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Erweiterter Konfigurations-Editor"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Nach dem Spitznamen:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Nach der Zeit:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2088,57 +2118,57 @@ msgstr ""
 "Nur beim Schreiben\n"
 "Deaktiviert"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Sende _Betriebssystem-Information"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Erlaube ihm/ihr meinen Status zu sehen"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Popups/Benachrichtigungen _zulassen, wenn ich abwesend/NA/beschäftigt/"
 "unsichtbar bin"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "Auch als iChat-Stil bekannt"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Erfrage Status-Nachricht beim: "
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Darum bitten, seinen/ihren Status zu sehen"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Frage:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Open_PGP-Schlüssel zuweisen"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Kontakt autorisieren, sodass er sehen kann, wann Sie verbunden sind"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Automatisch _abwesend nach:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Automatisch _nicht verfügbar nach:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Automatisch verbinden"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2150,15 +2180,15 @@ msgstr ""
 "Immer KDE Standard-Anwendungen verwenden\n"
 "Benutzerdefiniert"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Kontakt automatisch autorisieren"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Automatisch neu verbinden, wenn die Verbindung abbricht"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2171,13 +2201,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Vor dem Spitznamen:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Vor der Zeit:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Vor dem Spitznamen:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2294,134 +2321,138 @@ msgid "Company:"
 msgstr "Firma:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "_Raum einrichten"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "verbinde, sobald ich Fertig klicke"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Verbindung"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Kontakt-Information"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "Kontakt-_Info"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "Unterhaltungs-Verlauf"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "Land:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "Standard _Status-Symbole:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Lösche MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Lösche Nachricht des Tages"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Löscht die Nachricht des Tages"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Ablehnen"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Autorisierung des Kontakts verweigern, sodass er nicht sehen kann, wann Sie "
 "verbunden sind"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Abteilung:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Zeige Avatar von Kontakten im Roster"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Zeige die Statusnachricht von Kontakten im Roster"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "Alle 5 _Minuten"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Gruppen bearbeiten"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Persönliche _Details bearbeiten..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "_Gruppen bearbeiten"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Emoticons"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Einschalten"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Erneut eingeben zur Bestätigung:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Neues Passwort eingeben:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Ereignisse"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "Alle 5 _Minuten"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Zusatz-Adresse:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Nachname:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Dateitransfers"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "_Dateitransfers"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Dateimanager:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Filter:"
@@ -2431,39 +2462,35 @@ msgid "Font style:"
 msgstr "Schriftart:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Schriftart:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Verbiete ihm/ihr meinen Status zu sehen"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: JJJJ-MM-TT"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Häufig gestellte Fragen (online)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "Von:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "_Los"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Gajim Thema Einstellungen"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2473,7 +2500,7 @@ msgstr ""
 "Gajim kann Meta-Information, die eine Unterhaltung mit einem Kontakt "
 "betrifft, empfangen und versenden"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2481,7 +2508,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:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2490,7 +2517,7 @@ msgstr ""
 "Gajim wird Sie über neue Nachrichten mit einem Popup in der rechten unteren "
 "Ecke des Bildschirms benachrichtigen"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2498,7 +2525,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:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2506,7 +2533,7 @@ 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:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
@@ -2514,19 +2541,27 @@ msgstr ""
 "Gajim wird nur das Symbol des Kontaktes ändern, von dem die neue Nachricht "
 "kommt"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontoeinrichtungs-Wizard"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Allgemein"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Vorname:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Kein"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Gruppe:"
@@ -2574,17 +2609,23 @@ 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:170
-msgid "If checked, Gajim will also have a trayicon"
-msgstr "Wenn gewählt, wird Gajim ein Tray-Symbol verwenden"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
+msgstr ""
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr "Wenn aktiviert, wird Gajim einen Avatar im Roster-Fenster einblenden"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Wenn aktiviert wird Gajim für jeden Kontakt im Roster eine Statusnachricht "
 "unter dem jeweiligen Kontaktnamen anzeigen"
@@ -2667,8 +2708,9 @@ msgstr ""
 "Gajim alle Kontakte auflisten, als hätten Sie ein Konto"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Eingehende Nachricht:"
+#, fuzzy
+msgid "Inactive"
+msgstr "Aktiv"
 
 #. 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:185
@@ -2704,39 +2746,57 @@ msgid "Location"
 msgstr "Ort"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Nachricht"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Verwalten..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Konten Verwalten"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Verwalte Bookmarks"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Proxy Verwaltung"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Verwalten..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Mittelname"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Mehr"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2744,109 +2804,105 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Spitzname:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Kein"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Über Kontakte benachrichtigen, die sich "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "BS:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "In jeder _Zeile"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 #, fuzzy
 msgid "One message _window:"
 msgstr "Nachricht senden und Fenster schließen"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Öffnen..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Ausgehende Nachricht:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "Pass_wort:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Unterbrochen"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Persönliche Details bearbeiten..."
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Telefon-Nr.:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "_Klänge abspielen"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Position:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Postleitzahl:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Einstellungen"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Präfix"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "Statusnachricht"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Zeit anzeigen:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Priori_tät:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2857,61 +2913,53 @@ msgstr ""
 "selben Konto verbunden sind. Der Client mit der höchsten Priorität bekommt "
 "die Ereignisse"
 
-#: ../src/gtkgui.glade.h:237
-msgid "Profile, Avatar"
-msgstr "Profile, Avatar"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Anfrage-Baukasten..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Kürzlich:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Registrieren auf"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Konto entfernen (_nur in Gajim)"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Konto _entfernen (in Gajim und auf dem Server)"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Entferne Dateitransfer von Liste"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr ""
 "Entferne beendete, abgebrochene und fehlgeschlagene Dateitransfers von der "
 "Liste"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Nachricht beantworten"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Auf Standard-Farben zurücksetzen"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "Ressour_ce: "
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2926,168 +2974,160 @@ msgstr ""
 "verbinden. Die Ressource mit der höchsten Priorität wird die Nachrichten "
 "erhalten (siehe unten)"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Ressource:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Rolle:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Raum-Konfiguration"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Raum:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "_Passphrase speichern (unsicher)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr "Speichere _Position und Größe der Kontaktliste und Chatfenster"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Datei speichern unter..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Unter_haltungsverlauf für alle Kontakte dieses Kontos speichern"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Pass_wort speichern"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Search"
 msgstr "_Suche"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "Sen_den"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Datei Senden"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Einzelne Nachricht Senden"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "_Datei Senden"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Sende _neue Nachricht..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Sende keep-alive Pakete"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Nachricht senden"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Nachricht senden und Fenster schließen"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 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:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Fähigkeiten des Servers"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Setze MOTD"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Setze Message of the Day"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "_Avatar wählen"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Verwende einen Avater, wenn ich mich verbinde"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Setzt Message of the Day"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Zeige alle schwebenden _Ereignisse"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "_Abgemeldete Kontakte anzeigen"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "_Roster anzeigen"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Zeige _XML Konsole"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Nur in der _Kontaktliste anzeigen"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Shows a list of file transfers between you and other"
 msgstr "Zeigt eine Liste von Dateitransfers"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "_anmelden"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "a_bmelden"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Kontakte nach Status sortieren"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "_Chat starten"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Staat:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Statusnachricht:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Status:"
@@ -3118,25 +3158,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Konto-Status mit globalem Status abgleichen"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Thema:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "Text_farbe:"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "Schrift_art:"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "Automatische Statusnachricht für Abwesend"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "Automatische Statusnachricht für Nicht verfügbar"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Thema:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3162,50 +3203,56 @@ msgid "Type:"
 msgstr "Art:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Unterstreichen"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "MOTD Aktualisieren"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Aktualisiere Nachricht des Tages (MOTD)"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Aktualisiert Message of the Day"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "_SSL verwenden"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "_Transport-Symbole verwenden"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Verwende Authentifizierung"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Verwende benutzerdefinierten Hostname und Port"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "Dateitransfer-Liste"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "Symbol im Systemabschn_itt (Benachrichtigungs-Bereich)"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "Benutzer-ID:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Zeige eine Benachrichtigung, wenn die Datei komplett übertragen wurde."
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3218,21 +3265,21 @@ msgstr ""
 "HINWEIS:Neue Nachrichtenereignisse treten nur auf, wenn Sie eine neue "
 "Nachricht von einem Konktakt erhalten, mit dem Sie nicht bereits chatten"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Wenn neue Nachricht empfangen wird"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Arbeit"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3240,416 +3287,455 @@ msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie zum Jabber-Netzwerk verbinden\n"
 "können."
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Ihre JID:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Aktionen"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "Kontakt _Hinzufügen..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "Zur Kont_aktliste hinzufügen"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "Erweitert"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Nach der Zeit:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Autorisieren"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "_Hintergrund:"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Verbannen"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Vor der Zeit:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "Raum zu _Bookmarks hinzufügen"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "_Kompakte Ansicht Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "In_halte"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "Email-Adresse _kopieren"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "Link-Adresse _kopieren"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Ablehnen"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Dienste durchsuchen"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Durchsuche Dienste..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Dateimanager:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Beenden"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Schriftart:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "_Gruppenchat"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "Falsch geschriebene Wörter _hervorheben"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_Verlauf"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_Info/Query"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "Symbol im Systemabschn_itt (Benachrichtigungs-Bereich)"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Ereignisse von Kontakten, die nicht in der Liste sind, _ignorieren"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Eingehende Nachricht:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "_Neuen Raum betreten"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "_Rausschmeißen"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "Unterhaltungs-Ver_lauf"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "_Logge die Statusveränderungen von Kontakten"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "_Mail-Programm:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Mitglied"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "Konten _zusammenführen"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Ändern"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "Konto bearbeiten"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Name: "
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Nie"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "Be_nachrichtigen"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Benachrichtige mich, wenn der Dateitransfer abgeschlossen ist"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "_Benutzer Aktionen"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "_Angemeldete Benutzer"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "Email-Programm _öffnen"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "Link _öffnen"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Öffnen..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Ausgehende Nachricht:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "_Besitzer"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Player:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Öffnen"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Anwesenheit"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Veröffentlichen"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "Entfernen von _Kontaktliste"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "Antwo_rten"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Auf Standard-Farben zurücksetzen"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "Ab_rufen"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Passwort:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Suche"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "_Senden"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "_Senden & Schließen"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "Private Nachricht _Senden"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "_Sende Servernachricht"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "Sende _einzelne Nachricht"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Kontakte nach Status sortieren"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "Chat starten"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Statusnachricht:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "Abonnement"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+msgid "_URL:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Proxy benutzen"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "_Benutzername:"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Stimme verleihen"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "_XML Konsole..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "Dateitransfer-Liste"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "Minuten"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Fehler beim Lesen der Datei:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Fehler bei der Dateianalyse:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Konnte nicht an %s schreiben. Sitzungmanagment-Unterstützung wird nicht "
 "funktionieren"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Suche"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Lösche MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Suche"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "Erstelle Log-Datenbank"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3658,36 +3744,36 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Migriere Logs..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Datum"
@@ -3721,75 +3807,81 @@ msgstr "Status ist jetzt: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status ist jetzt: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Nachricht"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Starte Chat mit Account %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Konten zusammenführen"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 #, fuzzy
 msgid "Observers"
 msgstr "Server"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Sie sind bereits im Raum %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Sie können einem Chatraum nicht beitreten, wenn Sie unsichtbar sind."
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "_Neuen Raum betreten"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Verwalte Bookmarks..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "an %s Konto"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "mit %s Konto"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "mit Konto %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Verwalte Bookmarks..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "für Konto %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_Verlauf"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "_Neuen Raum betreten"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3797,67 +3889,76 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten von diesem Transport "
 "austauschen."
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel Zuweisen"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr "Ich würde dich gerne in meine Liste aufnehmen"
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "_Umbenennen"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "_Anmelden"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "_Abmelden"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt ihren Status."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, 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:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" wird Sie nun immer als offline sehen."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+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:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3865,38 +3966,38 @@ 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:1632
+#: ../src/roster_window.py:1780
 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:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, 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:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Passphrase speichern"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Passphrase"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3904,171 +4005,159 @@ 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:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 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:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 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:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Von %s in Raum %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Sendet dem Kontakt eine Datei"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "Ändere _Statusnachricht..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Versteckt dieses Menü"
 
-#: ../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"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %d ungelesene Nachricht"
 msgstr[1] "Gajim - %d ungelesene Nachrichten"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - %d ungelesene Einzel-Nachricht"
 msgstr[1] "Gajim - %d ungelesene Einzel-Nachrichten"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - %d ungelesene Gruppenchat-Nachricht"
 msgstr[1] "Gajim - %d ungelesene Gruppenchat-Nachrichten"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - %d ungelesene private Nachricht"
 msgstr[1] "Gajim - %d ungelesene private Nachrichten"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Rolle:"
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Zugehörigkeit: "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Status: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Ressource: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "Standard _Status-Symbole:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Größe: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Typ: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Größe: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Typ: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Übertragen: "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Nicht gestartet"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Unterbrochen"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Steht still"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Übertrage"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Dieser Dienst hat nicht mit detaillierten Informationen geantwortet"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4076,33 +4165,33 @@ msgstr ""
 "Dieser Dienst konnte nicht mit detaillierten Informationen antworten\n"
 "Er ist wahrscheinlich verwaltet oder defekt"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Avatar auswählen"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Bilder"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Durchsuche %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4110,7 +4199,7 @@ msgstr ""
 "Dieser Kontakt ist an Ihren Anwesenheitsinformationen interessiert, aber Sie "
 "sindnicht an seiner/ihrer Anwesenheit interessiert"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4118,14 +4207,14 @@ msgstr ""
 "Sie sind an den Anwesenheitsinformationen des Kontakts interessiert, aber er/"
 "sieist nicht an ihren interessiert"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Sie und der Kontakt sind an den Anwesenheitsinformationen des anderen "
 "interessiert"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4133,24 +4222,24 @@ msgstr ""
 "Sie sind nicht an der Anwesenheit des Kontakts interessiert, und er/sie "
 "istnicht interessiert an ihrer"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Sie warten auf die Antwort des Kontaktes auf ihre Abonnement-Anfrage"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " resource mit Priorität "
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Sie müssen angemeldet sein, um Kontakt-Informationen zu veröffentlichen"
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "Sie müssen angemeldet sein, um Kontakt-Informationen abzurufen"
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 #, fuzzy
 msgid "Personal details"
 msgstr "Persönliche Details bearbeiten..."
@@ -4195,46 +4284,48 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus auf diesem Computer nicht vorhanden oder das Python-Modul fehlt"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "Session-Bus nicht verfügbar"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr ""
 "Verwende DBus und Benachrichtigungs-Daemon um Benachrichtigungen zu zeigen"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Zeit in Minuten, nach der Ihr Status auf abwesend gesetzt wird"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Abwesend, da untätig"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Zeit in Minuten, nach der Ihr Status auf nicht verfügbar gesetzt wird."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Nicht verfügbar, da untätig"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Falls wahr, entferne */_ nicht. So wird *abc* fett aber * * wird nicht "
 "entfernt."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Füge * und [n] in die Kontaktleiste?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4242,12 +4333,12 @@ msgstr ""
 "Wie viele Zeilen von der vorherigen Unterhaltung gespeichert werden, wenn "
 "ein Chat Tab/Fenster wieder geöffnet wird."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Wie viele Minuten die Zeilen vom vorherigen Chat angezeigt werden sollen."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4255,20 +4346,20 @@ msgstr ""
 "Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch "
 "(Mirabilis ICQ-Client Standardeinstellung)."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Wie viele Zeilen für Strg+BildAuf gespeichert werden."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Kompaktansicht verwenden, wenn Sie ein Chatfenster öffnen"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Verwende Kompaktansicht wenn ein Gruppenchat-Fenster geöffnet wird"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4277,31 +4368,31 @@ msgstr ""
 "Entweder eine spezielle URL mit %s, wobei %s das Word/Phrase ist oder "
 "'WIKTIONARY', was bedeutet, dass ein Wörterbuch verwendet wird."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Falls aktiviert kann Gajim aus der Ferne mittels gajim-remote kontrolliert "
 "werden."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fragen, bevor ein Gruppenchat Tab/Fenster geschlossen wird."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Fragen, bevor ein Gruppenchat Tab/Fenster geschlossen wird."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Fragen, bevor ein Gruppenchat Tab/Fenster geschlossen wird."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4309,23 +4400,23 @@ msgstr ""
 "Überschreibt den Host für Datenübertragung für den Fall von NAT/Port-"
 "Forwarding"
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC-Standard sagt KiB = 1024 Byte, KB = 1000 Byte."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Tab bei einer einzelnen Unterhaltung anzeigen?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Tab-Grenze bei nur einer Konversation anzeigen?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Schließen-Button im Tab anzeigen?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4333,7 +4424,7 @@ msgstr ""
 "Eine mit Semilkolon getrennte List von Worten, die in einem Gruppenchat "
 "hervorgehoben werden."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4342,11 +4433,11 @@ msgstr ""
 "geklickt wird.Diese Option wird nur beachtet, wenn die Trayicon-"
 "Unterstützung aktiv ist."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Falls wahr, registriert Gajim bei jedem Start für xmpp://."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4354,7 +4445,7 @@ msgstr ""
 "Falls wahr. wird Gajim ein Icon auf jedem Tab mit ungelesenen Nachrichten "
 "anzeigen.Abhängig vom Theme ist dieses Icon animiert."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4362,7 +4453,7 @@ msgstr ""
 "Falls aktiviert, wird Gajim für jeden Kontakt die Statusnachricht, falls "
 "nicht leer, unter dem jeweiligen Kontaktnamen im Roster anzeigen"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4371,7 +4462,7 @@ msgstr ""
 "letzten Mal keinen hatte oder einen veralteten hat."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4379,20 +4470,20 @@ msgstr ""
 "Falls deaktiviert, werden Sie keine Statuszeile im Chat sehen, wenn ein "
 "Kontaktseinen Status und/oder seine Statusnachricht ändert."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4403,14 +4494,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Schlafen"
@@ -4480,184 +4582,98 @@ msgstr ""
 "Abzuspielender Ton, falls eine MUC-Nachricht ankommt. (Diese Einstellung "
 "wirdnur beachtet, wenn notify_on_all_muc_messages aktiviert ist)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "gemüse"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "menschlich"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "plain"
-
-#: ../src/common/connection.py:68
-#, fuzzy
-msgid "Unable to load idle module"
-msgstr "Fehler beim Betreten des Raum"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Fehler beim Betreten des Raum"
-
-#: ../src/common/connection.py:560
-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:563
-msgid "You are banned from this room."
-msgstr "Sie sind aus diesem Raum gebannt"
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Dieser Raum existiert nicht."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "Raumerstellung ist beschränkt"
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Sie müssen Ihren registrierten Spitznamen verwenden"
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Sie sind nicht in der Mitgliedliste"
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Der gwünschte Benutzername wird bereits verwendet oder ist von einem anderen "
-"Benutzer registriert.\n"
-"Bitte geben Sie einen anderen Benutzernamen an:"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-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:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "wir haben jetzt %s abonniert"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Anfrage zur Kündigung des Abonnements von %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "%s hat das Abonnement beendet"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 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:1464
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"Jid % ist nicht RfC-konform. Sie wird nicht zu ihrem Roster hinzugefügt. "
-"VerwendenSie ein Roster-Managmenttool wie http://jru.jabberstudio.org/ um "
-"ihn zu entfernen."
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Ungültiges Passwort"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Ungültiges Passwort"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Konnte nicht mit %s verbinden"
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Verbunden mit Server %s:%s mit %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 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:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 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:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "Keine OpenPGP-Passphrase gewählt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, 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:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "unsichtbar"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "abgemeldet"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Ich bin %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Diese Nachricht ist verschlüsselt]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4666,208 +4682,206 @@ msgstr ""
 "Thema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, 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:699
+msgid "I would like to add you to my roster."
+msgstr "Ich würde dich gerne zu meiner Liste hinzufügen."
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Ungültiges Zeichen im Benutzernamen"
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Server-Adresse wird benötigt."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Ungültiges Zeichen in Hostname."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Ungültiges Zeichen in Resource."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "_Angemeldet"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Angemeldet"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Verbinde"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "_Abwesend"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Abwesend"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "_Unsichtbar"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "Hat Fehler"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "Keine"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "An"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "Von"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "Keine:"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "Keine"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Moderatoren"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "schreibt im Moment..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "schreibt im Moment nicht mehr..."
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster oder den Reiter geschlossen"
 
@@ -4877,10 +4891,109 @@ msgstr "hat das Chatfenster oder den Reiter geschlossen"
 msgid "error: cannot open %s for reading"
 msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "plain"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "cyan"
 
+#~ msgid "Send"
+#~ msgstr "Senden"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr ""
+#~ "%(nickname)s im Raum %(room_name)s hat Ihnen eine neue Nachricht gesendet."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s hat Ihnen eine neue Nachricht gesendet."
+
+#, fuzzy
+#~ msgid "GUI Migration failed"
+#~ msgstr "vCard Veröffentlichung fehlgeschlagen"
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "Logs wurden erfolgreich in die Datenbank migriert."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr "Wenn gewählt, wird Gajim ein Tray-Symbol verwenden"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Profile, Avatar"
+
+#~ msgid "_Online Users"
+#~ msgstr "_Angemeldete Benutzer"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Starte Chat mit Account %s"
+
+#~ msgid "All contacts in this group are offline or have errors"
+#~ msgstr "Alle Kontakte dieser Gruppe sind abgemeldet oder haben Fehler"
+
+#~ msgid "Size: "
+#~ msgstr "Größe: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "Session-Bus nicht verfügbar"
+
+#, fuzzy
+#~ msgid "Unable to load idle module"
+#~ msgstr "Fehler beim Betreten des Raum"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Fehler beim Betreten des Raum"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Für das Betreten dieses Raumes ist ein Passwort nötig."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Sie sind aus diesem Raum gebannt"
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Dieser Raum existiert nicht."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "Raumerstellung ist beschränkt"
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Sie müssen Ihren registrierten Spitznamen verwenden"
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Sie sind nicht in der Mitgliedliste"
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "Der gwünschte Benutzername wird bereits verwendet oder ist von einem "
+#~ "anderen Benutzer registriert.\n"
+#~ "Bitte geben Sie einen anderen Benutzernamen an:"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "wir haben jetzt %s abonniert"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "Anfrage zur Kündigung des Abonnements von %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "%s hat das Abonnement beendet"
+
+#, fuzzy
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "Jid % ist nicht RfC-konform. Sie wird nicht zu ihrem Roster hinzugefügt. "
+#~ "VerwendenSie ein Roster-Managmenttool wie http://jru.jabberstudio.org/ um "
+#~ "ihn zu entfernen."
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr ""
+#~ "Registrierungsinformation für Transport %s sind nicht rechtzeitig "
+#~ "angekommen"
+
 #~ msgid "Sound"
 #~ msgstr "Sound"
 
@@ -5022,9 +5135,6 @@ msgstr "cyan"
 #~ msgid "with account "
 #~ msgstr "Konto: "
 
-#~ msgid "New Message as %s"
-#~ msgstr "Neue Nachricht als %s"
-
 #~ msgid "Chat with"
 #~ msgstr "Unterhalten mit"
 
diff --git a/po/el/LC_MESSAGES/gajim.po b/po/el/LC_MESSAGES/gajim.po
index 356ed387a..8ddfc0ed3 100644
--- a/po/el/LC_MESSAGES/gajim.po
+++ b/po/el/LC_MESSAGES/gajim.po
@@ -6,12 +6,12 @@
 # Stavros Giannouris <stavrosg2002@freemai.gr>, 2005.
 # Filippos Papadopoulos <filip@cs.uoi.gr>, 2005.
 #
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2005-12-17 23:13+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
 "Language-Team: Hellenic-Ελληνικά-Greek\n"
@@ -58,7 +58,7 @@ msgid "Hidden"
 msgstr "Μυστικό"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -75,63 +75,60 @@ msgstr ""
 "Η υπογράμμιση τυπογραφικών λαθών απενεργοποιήθηκε"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 msgid "Your message can not be sent until you are connected."
 msgstr "Δεν μπορεί να από το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Κουβέντα"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Κουβέντα"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "Κρυπτογράφηση OpenPGP"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "Ο/η %s δεν έχει στείλει ένα κλειδί OpenPGP ούτε εσείς έχετε εφαρμόσει κάποιο"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "εκτός λίστας επαφών"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -139,20 +136,20 @@ msgstr ""
 "Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
 "μήνυμα θα χαθεί."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Κάθε %s _λεπτά"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Ενεργοποιημένο"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Γεγονός"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -200,204 +197,217 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στον διακομιστή"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Το όνομα λογαριασμού δεν μπορεί να είναι κενό."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δεν μπορεί να έχει κενά."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή\"."
 
-#: ../src/config.py:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Μη έγκυρη καταχώρηση"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε τον λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες"
 
-#: ../src/config.py:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στον διακομιστή"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
 "πληροφορίες"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Σφάλμα κατά την λήψη μυστικών κλειδιών"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Σφάλμα κατά την λήψη του OpenPGP μυστικών κλειδιών σας."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Κρυπτογράφηση OpenPGP"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Επιλέξτε το OpenPGP κλειδί σας"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Καμία επιλογή κλειδιού"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Διακομιστής"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 #, fuzzy
 msgid "Member List"
 msgstr "_Μέλος"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 #, fuzzy
 msgid "Owner List"
 msgstr "_Ιδιοκτήτης"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Διαχειριστής"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 #, fuzzy
 msgid "Nick"
 msgstr "_Ξεφορτώσου τον"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 #, fuzzy
 msgid "Role"
 msgstr "Ρόλος:"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 #, fuzzy
 msgid "Banning..."
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Παρακαλώ επιλέξτε την ακριβή ενέργεια</b>"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Παρακαλώ επιλέξτε την ακριβή ενέργεια</b>"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Παρακαλώ επιλέξτε την ακριβή ενέργεια</b>"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Διαχειριστής"
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Παρακαλώ επιλέξτε την ακριβή ενέργεια</b>"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -407,79 +417,89 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαιρώντας τον λογαριασμό %s"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με τον διακομιστή"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Απαιτείται Κωδικός"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με τον διακομιστή"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Νέο Δωμάτιο"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά "
 "αφαιρέστε τον σελιδοδείκτη."
 
-#: ../src/config.py:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
 "λογαριασμού."
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 msgid "You must enter a password for the new account."
 msgstr "Πρέπει να δώσετε έναν κωδικό για τον νέο λογαριασμό."
 
-#: ../src/config.py:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Μη έγκυρο Jabber ID"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Αυτή η επαφή υπάρχει ήδη στην λίστα επαφών σας."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "Ο λογαριασμός προστέθηκε με επιτυχία"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -488,19 +508,19 @@ msgstr ""
 "επιλέγοντας το κουμπί για Προχωρημένους, ή αργότερα εάν επιλέξετε "
 "Λογαριασμοί από το μενού Επεξεργασία στο κυρίως παράθυρο."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Σφάλμα κατά την διάρκεια δημιουργίας λογαριασμού"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
@@ -559,168 +579,167 @@ msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Δεν υπάρχει υποστήριξη D-Bus για την python σε αυτόν τον υπολογιστή"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Οι δυνατότητες του Gajim για D-Bus δε θα χρησιμοποιηθούν"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Όνομα επαφής: <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Μεταφορές"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Ομάδα"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "Στην ομάδα"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "Ταυτότητα Κλειδιού"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Όνομα επαφής"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "Μήνυμα για Κατάσταση %s"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Μήνυμα Κατάστασης"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Προκαθορισμένα Μηνύματα Κατάστασης</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Εισάγετε το νέο μήνυμα κατάστασης:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε στον "
 "λογαριασμό %s"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Μεταφορές"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "Μη έγκυρη ταυτότητα χρήστη"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Επαφή ήδη στην λίστα επαφών"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Αυτή η επαφή υπάρχει ήδη στην λίστα επαφών σας."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr ""
 "Νίκος Κουρεμένος <kourem@gmail.com>\n"
 "Φίλιππος Παπαδόπουλος <psybases@gmail.com>\n"
 "Σταύρος Γιαννούρης <stavrosg2002@freemail.gr>"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Αίτηση εγγραφής για τον λογαριασμό %s από %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Αίτηση εγγραφής από %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Δεν μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Συμμετοχή σε Ομαδική Συζήτηση με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε Ομαδική Συζήτηση"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Έναργξη Κουβέντας με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Έναρξη κουβέντας"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -729,158 +748,165 @@ msgstr ""
 "θέλετε να στείλετε ένα μήνυμα συζήτησης"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας"
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Σύνδεση Επαφής"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση Επαφής"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Νέο Μήνυμα"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Νέο Μονό Μήνυμα"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Νέο Προσωπικό Μήνυμα"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Αίτηση μεταφοράς αρχείου"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Σφάλμα μεταφοράς αρχείου"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Η Μεταφορά Αρχείου Ολοκληρώθηκε"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Η Μεταφορά Αρχείου Διακόπηκε"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Αίτηση μεταφοράς αρχείου"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Σφάλμα μεταφοράς αρχείου"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Η Μεταφορά Αρχείου Ολοκληρώθηκε"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Η Μεταφορά Αρχείου Διακόπηκε"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "Κανένας"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Μονό Μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Μονό Μήνυμα"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "Ο/Η %s έγραψε:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Κονσόλα για %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "Προσκαλέσατε τον/την %(contact_jid)s στο %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Επιλογή Ήχου"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Αρχεία Ήχου Wav"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Άλλα"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Πρέπει να συνδεθείτε για να περιηγηθείτε στις υπηρεσίες"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ανακάλυψη Υπηρεσιών χρησιμοποιώντας τον λογαριασμό %s"
@@ -889,11 +915,11 @@ msgstr "Ανακάλυψη Υπηρεσιών χρησιμοποιώντας τ
 msgid "Service Discovery"
 msgstr "Ανακάλυψη Υπηρεσιών"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Η υπηρεσία δεν ήταν δυνατό να βρεθεί"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -901,175 +927,176 @@ msgstr ""
 "Δεν υπάρχει υπηρεσία στη διεύθυνση που εισάγατε, ή δεν ανταποκρίνεται. "
 "Ελέγξτε τη διεύθυνση και προσπαθήστε ξανά."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Η υπηρεσία δεν είναι περιηγήσιμη"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Αυτού του είδους η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "με χρήση του λογαριασμού %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Περιήγηση"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "Ε_πεξεργασία"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Σάρωση %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Χρήστες"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Αρχείο"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Χρόνος"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Πρόοδος"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Όνομα αρχείου: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Mέγεθος: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Αποστολέας: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Παραλήπτης: "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Αποθηκεύτηκε στο: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Άνοιγμα του περιέχοντος φακέλου"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Η μεταφορά αρχείου ακυρώθηκε"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "Η σύνδεση με τον τον απομακρυσμένο ομότιμο δεν ήταν εφικτή."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Η μεταφορά αρχείου σταμάτησε από την επαφή της άλλης πλευράς"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Αποστολή"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "_Αποστολή"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Το Gajim δεν έχει πρόσβαση σε αυτό το αρχείο"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Αυτό το αρχείο χρησιμοποιείται από άλλη διεργασία."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Αυτό το αρχείο υπάρχει ήδη."
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Παρακαλώ επιλέξτε την ακριβή ενέργεια</b>"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Αρχείο: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Τύπος: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Περιγραφή: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Αποθήκευση Αρχείου ως..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Θέλετε να αντικατασταθεί;"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1077,7 +1104,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/δεπτ)"
@@ -1094,12 +1121,12 @@ msgstr "Αρχείο:"
 msgid "It is not possible to send empty files"
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
@@ -1107,32 +1134,32 @@ msgstr "Αποστολέας: "
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Συνέχεια"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "εμφανίζει βοήθεια για μια συγκεκριμένη εντολή"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "εντολή"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "εμφάνιση βοήθειας στην εντολή"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Εμφάνιση ενός παραθύρου με το επόμενο αδιάβαστο μήνυμα"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1140,45 +1167,45 @@ msgstr ""
 "Εμφανίζει όλες τις επαφές στην λίστα επαφών. Κάθε επαφή εμφανίζεται σε μια "
 "ξεχωριστή γραμμή"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "λογαριασμός"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "εμφάνιση μόνο των επαφών του συγκεκριμένου λογαριασμού"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Εμφανίζει τη λίστα των καταχωρημένων λογαριασμών"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "κατάσταση"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, "
 "εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "μήνυμα"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "μήνυμα κατάστασης"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1187,23 +1214,23 @@ msgstr ""
 "δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών με έχουν "
 "ενεργοποιημένη την επιλογή \"συγχρονισμός με την γενική κατάσταση\""
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Εμφανίζει το διαλόγου κουβέντας ώστε να μπορείτε να στέλνετε μηνύματα σε μια "
 "επαφή"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "το JID της επαφής με την οποία θέλετε να συνομιλήσετε"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "εάν έχει καθοριστεί, η επαφή λαμβάνεται από την λίστα επαφών αυτού του "
 "λογαριασμού"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1214,119 +1241,119 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "περιεχόμενα μηνύματος"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "κλειδί pgp"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "εάν καθοριστεί, το μήνυμα θα κρυπτογραφηθεί χρησιμοποιώντας αυτό το δημόσιο "
 "κλειδί"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 "εάν καθοριστεί, το μήνυμα θα σταλεί χρησιμοποιώντας αυτόν τον λογαριασμό"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Λήψη αναλυτικών πληροφοριών για μία επαφή"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "το JID της επαφής"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Λήψη αναλυτικών πληροφοριών για μία επαφή"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Αποστολή αρχείου σε μία επαφή"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "αρχείο"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Διαδρομή αρχείου"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr ""
 "εάν καθοριστεί, το αρχείο θα σταλεί χρησιμοποιώντας αυτόν τον λογαριασμό"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Εμφανίζει όλες τις προτιμήσεις και τις τιμές τους"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Καταχωρεί την 'τιμή' στην τιμή του 'κλειδιού'"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "κλειδί=τιμή"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "Το 'κλειδί' είναι το όνομα της προτίμησης, ενώ 'τιμή' είναι η τιμή που του "
 "έχει προσδιοριστεί"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Διαγράφει μια προτίμηση"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "κλειδί"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "όνομα της προτίμησης που πρόκειται να διαγραφεί"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Γράφει την τρέχουσα κατάσταση των προτιμήσεων του Gajim στο .config αρχείο"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Προσθέτει μια επαφή σε αυτό το λογαριασμό."
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
@@ -1334,16 +1361,16 @@ msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Λείπει το όρισμα \"contact_jid\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1352,16 +1379,16 @@ msgstr ""
 "Η επαφή '%s' δεν είναι στην λίστα σας.\n"
 "Παρακαλώ καθορίστε τον λογαριασμό που θα σταλεί το μήνυμα."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1370,16 +1397,16 @@ msgstr ""
 "Χρήση: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Ορίσματα:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "μη υπαρκτό %s"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1388,7 +1415,7 @@ msgstr ""
 "Χρήση: %s εντολή [ορίσματα]\n"
 "Η εντολή είναι μία από τις:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1397,31 +1424,31 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Το Gajim απαιτεί Xserver για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Η libglade λείπει από το GTK+"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1430,7 +1457,7 @@ msgstr ""
 "Παρακαλώ απεγκαταστήστε την τρέχουσα έκοδση του GTK+ και εγκαταστήστε την "
 "τελευταία σταθερή έκδοση από %s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -1438,127 +1465,146 @@ msgstr ""
 "Παρακαλώ βεβαιωθείτε ότι το GTK+ και το PyGTK του συστήματος σας έχουν "
 "υποστήριξη της libglade"
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Το Gajim χρειάζεται την PySQLite2 για να τρέξει"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gajim.py:498
-#, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "Ο/Η %(nickname)s στο δωμάτιο %(room_name)s σας έστειλε ένα μήνυμα."
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Σύνδεση Επαφής"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "Ο/Η %s σας έστειλε ένα νέο μήνυμα."
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Αποσύνδεση Επαφής"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Νέο Προσωπικό Μήνυμα"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Νέο Μονό Μήνυμα"
+
+#: ../src/gajim.py:610
+#, fuzzy, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Νέο Μήνυμα ως %s"
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "σφάλμα κατά την αποστολή"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάσταση της."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Θα βλέπετε την επαφή πάντα ως αποσυνδεδεμένη."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Ελέγξτε την σύνδεση σας ή δοκιμάστε αργότερα."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "Ο %s είναι τώρα %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "H κωδική φράση είναι λανθασμένη"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Είστε συνδεδεμένοι χωρίς την χρήση του OpenPGP κλειδιού σας"
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] "Έχετε μη-αναγνωσμένα μηνύματα"
 msgstr[1] "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Λάβατε το αρχείο %(filename)s από τον/την %(name)s επιτυχώς."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Οι προσωπικές σας πληροφορίες δημοσιοποιήθηκαν με επιτυχία."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1568,162 +1614,146 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
-#: ../src/gajim.py:1719
-#, fuzzy
-msgid "GUI Migration failed"
-msgstr "Η δημοσιοποίηση της vCard απέτυχε"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "Το ιστορικό έχει μεταφερθεί στη βάση δεδομένων με επιτυχία."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Η υποστήριξη για Διαχείριση Συνόδων δεν είναι διαθέσιμη (δεν υπάρχει το "
 "άρθρωμα του gnome.ui)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Μεταφορά Ιστορικού..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Παρακαλώ περιμένετε όσο μεταφέρεται το ιστορικό..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Θέμα"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "όνομα θέματος"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Δεν είναι δυνατή η διαγραφή του τρέχοντος θέματος"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Παρακαλώ επιλέξτε ένα άλλο θέμα πρώτα."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Έναρξη κουβέντας"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Έναρξη κουβέντας"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Ομαδική Συζήτηση"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Ομαδική Συζήτηση"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Αυτό το δωμάτιο δεν έχει θέμα"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "Ο %s έφυγε"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "Ο %s είναι τώρα %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Δεν βρέθηκε το ψευρώνυμο: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Προσκαλέσατε τον/την %(contact_jid)s στο %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "Το %s δεν φαίνεται να είναι έγκυρο JID"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Δεν βρέθηκε η εντολή: /%s (εάν θέλετε να το πείτε αυτό βάλτε το /say μπροστά)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Εντολές: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1736,7 +1766,7 @@ msgstr ""
 "Εάν το JID είναι στο δωμάτιο, ο χρήστης θα πεταχτεί έξω επίσης. ΔΕΝ "
 "υποστηρίζει κενά στο ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1744,12 +1774,12 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο>, ανοίγει ένα παράθυρο προσωπικής κουβέντας με το "
 "συγκεκριμένο χρήστη."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Χρήση: /%s, καθαρίζει το παράθυρο από το κείμενο."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1758,13 +1788,13 @@ msgstr ""
 "Χρήση: /%s [λόγος], κλείνει το τρέχον παράθυρο ή καρτέλα, ανακοινώνοντας το "
 "λόγο εάν έχει προσδιοριστεί."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr ""
 "Χρήση: /%s, θέτει το παράθυρο της ομαδικής κουβέντας σε συμπαγή κατάσταση."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1773,7 +1803,7 @@ msgstr ""
 "Χρήση: /%s <JID> [λόγος], προσκαλεί το JID στο τρέχον δωμάτιο, παρέχοντας "
 "προαιρετικά και λόγο."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1782,7 +1812,7 @@ msgstr ""
 "Χρήση: /%s <δωμάτιο>@<διακομιστής>[/ψευδώνυμο], επιδιώκει την είσοδο στο "
 "δωμάτιο@διακομιστή, προαιρετικά χρησιμοποιώντας το ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1792,7 +1822,7 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο> [αιτία], βγάζει τον χρήστη που προσδιορίστηκε από το "
 "δωμάτιο, προσδιορίζοντας την αιτία. ΔΕΝ υποστηρίζει κενά στο ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1801,7 +1831,7 @@ msgstr ""
 "Χρήση: /%s <δράση>, στέλνει τη δράση στο τρέχον δωμάτιο, με χρήση τρίτου "
 "προσώπου (π.χ. /%s χοροπηδάει)."
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1810,17 +1840,17 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο> [μήνυμα], ανοίγει ένα παράθυρο προσωπικού διαλόγου "
 "και στέλνει το μήνυμα στο χρήστη που προσδιορίστηκε."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Χρήση: /%s <ψευδώνυμο>, αλλάζει το ψευδώνυμο σας στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -1828,72 +1858,72 @@ msgstr ""
 "Χρήση: /%s <μήνυμα>, στέλνει ένα μήνυμα χωρίς να γίνει έλεγχος για άλλες "
 "εντολές."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Δεν υπάρχουν πληροφορίες για το /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "Μη_ν με ξαναρωτήσεις"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Αλλαγή Θέματος"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Αλλαγή Ψευδωνύμου"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
 "κεντρικό παράθυρο."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
@@ -1941,111 +1971,120 @@ msgstr "<b>Επεξεργασία Ρυθμίσεων για Προχωρημέν
 msgid "<b>Applications</b>"
 msgstr "<b>Εφαρμογές</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Προσαρμοσμένες Ρυθμίσεις</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Περιγραφή</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Μορφή μια γραμμής κουβέντας</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Προσαρμογή Διεπαφής</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Κίνηση Jabber</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Διάφορα</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Προσωπικές Πληροφορίες</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Παρακαλώ επιλέξτε ένα από τα παρακάτω:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για τον νέο λογαριασμό σας</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Παρακαλώ επιλέξτε ένα από τα παρακάτω:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Προκαθορισμένα Μηνύματα Κατάστασης</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Ιδιότητες</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Ρυθμίσεις</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Ήχοι</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Εισάγετε το νέο μήνυμα κατάστασης:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Οπτικές γνωστοποιήσεις</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Παρακαλώ επιλέξτε την ακριβή ενέργεια</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>Είσοδος δεδομένων XML</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "_Λογαριασμοί"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Μετά από ψευδώνυμο:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "Περί"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Αποδοχή"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Λογαριασμός"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2057,52 +2096,44 @@ msgstr ""
 "Επαφή\n"
 "Banner"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Τροποποίηση Λογαριασμού"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Λογαριασμοί"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "Ενέργειες για Προ_χωρημένους"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Προσθήκη Νέας Επαφής"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Οπτικές γνωστοποιήσεις</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Προσθήκη _Επαφής"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Προχωρημένοι"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Επεξεργασία Ρυθμίσεων για Προχωρημένους"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Μετά από ψευδώνυμο:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Μετά από χρόνο:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2112,58 +2143,58 @@ msgstr ""
 "Μόνο αν κάποιος γράφει ένα μήνυμα\n"
 "Απενεργοποιημένες"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Επίτρεψη α_ποστολής πληροφοριών για το λειτ. σύστημα"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Επέτρεψε τον/την να βλέπει την κατάστασή μου"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Επίτρεψη εμφανίσεων/γνωστοποιήσεων όταν είμαι _απομακρ./μη διαθ./απασχολ./"
 "αφανής"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "Επίσης γνωστό ως στυλ iChat"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Ερώτηση μηνύματος κατάστασης όταν γίνομαι:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Ζήτα να βλέπεις την κατάσταση του/της"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Ζητείται:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Ανάθεση Open_PGP Κλειδιού"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr ""
 "Εξουσιοδοτήστε μια επαφή ώστε να μπορεί να ξέρει πότε είστε συνδεδεμένος"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Αυτόματα _απομακρυσμένος μετά:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Αυτόματα _μη διαθέσιμος μετά:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Αυτόματη είσοδος"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2175,15 +2206,15 @@ msgstr ""
 "Πάντα χρήση των προεπιλεγμένων εφαρμογών του KDE\n"
 "Προσαρμοσμένες ρυθμίσεις"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Αυτόματη εξουσιοδότηση επαφής"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Αυτόματη επανασύνδεση κατά την απώλεια της σύνδεσης"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2196,13 +2227,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Πριν το ψευδώνυμο:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Πριν από χρόνο:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Πριν το ψευδώνυμο:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2319,134 +2347,138 @@ msgid "Company:"
 msgstr "Εταιρία:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Τροποποίηση _Δωματίου"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Σύνδεση όταν επιλέξω Τέλος"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Σύνδεση"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Πληροφορίες Επαφής"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "Πλη_ροφορίες Επαφής"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "Ιστορικό Κουβέντας"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "Χώρα:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "_Σετ εικονιδίων κατάστασης:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Διαγραφή MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Διαγραφή Μηνύματος της Ημέρας"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Διαγράφει το Μήνυμα της Ημέρας (MOTD)"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Άρνηση"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Αρνηθείτε εξουσιοδότηση σε μια επαφή ώστε να μην μπορεί να γνωρίζει πότε "
 "είστε συνδεδεμένος"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Τμήμα"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Εμφάνιση των άβαταρ των επαφών στην λίστα επαφών"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Εμφάνιση των μηνυμάτων κατάστασης των επαφών στη λίστα επαφών"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "Ε-Mail:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "Κάθε 5 _λεπτά"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Τροποποίηση Ομάδων"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Τροποποίηση Προσωπικών Πληροφοριών..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Επεξεργασία _Ομάδων"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Διαχείριση Συμβόλων"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Επαναπληκτρολογήστε για επιβεβαίωση:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Πληκτρολογήστε νέο κωδικό:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Γεγονότα"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "Κάθε 5 _λεπτά"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Επιπλέον Οδός:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Οικογένεια:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Μεταφορές Αρχείων"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "_Μεταφορές Αρχείων"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Διαχειριστής αρχείων:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Φιλτράρισμα:"
@@ -2456,39 +2488,35 @@ msgid "Font style:"
 msgstr "Γραμματοσειρά:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Γραμματοσειρά:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Απαγόρευσε τον/την να βλέπει την κατάστασή μου"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Συχνές Ερωτήσεις (online)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "Από:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "Πάμ_ε"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Προσαρμογή Θεμάτων Gajim"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2498,7 +2526,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα γνωστοποιεί την ικανότητα του να στέλνει και να "
 "λαμβάνει μετα-πληροφορίες σχετικές με μια συζήτηση που έχετε με μια επαφή"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2506,7 +2534,7 @@ msgstr ""
 "Το Gajim θα εμφανίσει αυτόματα το νέο εισερχόμενο μήνυμα σε ένα νέο παράθυρο "
 "κουβέντας ή σε μια καρτέλα ενός ήδη υπάρχοντος παραθύρου κουβέντας"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2515,7 +2543,7 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει για το νέο μήνυμα μέσω ενός αναδυόμενου "
 "παραθύρου στο κάτω δεξιά μέρος της οθόνης"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2523,7 +2551,7 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις συνδέθηκαν στο Jabber"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2531,25 +2559,33 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις αποσυνδέθηκαν στο Jabber"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Το Gajim θα αλλάξει μόνο το εικονίδιο της επαφής που έστειλε το μήνυμα"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Οδηγός Δημιουργίας Λογαριασμού"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Γενικά"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Δοθέν Όνομα"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Τίποτα"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Ομάδα:"
@@ -2597,19 +2633,24 @@ msgid "I would like to add you to my contact list."
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
 #: ../src/gtkgui.glade.h:170
-msgid "If checked, Gajim will also have a trayicon"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
 msgstr ""
-"Αν επιλεγεί, το Gajim θα έχει δικό του εικονίδιο στην περιοχή γνωστοποίησης"
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα μηνύματα κατάστασης των επαφών σας "
 "κάτω από τα ονόματα τους στη λίστα επαφών"
@@ -2694,8 +2735,9 @@ msgstr ""
 "εμφανίζει τις επαφές σας σαν να είχατε ένα λογαριασμό"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Εισερχόμενο μήνυμα:"
+#, fuzzy
+msgid "Inactive"
+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:185
@@ -2731,39 +2773,57 @@ msgid "Location"
 msgstr "Περιοχή"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Μήνυμα"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Διαχείριση..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Διαχείριση Λογαριασμών"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Διαχείριση Σελιδοδεικτών"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Διαχείριση Προφίλ Μεσολαβητή"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Διαχείριση..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Μέσο:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "_Συντονιστής"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Περισσότερα"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2771,109 +2831,105 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Όνομα χρήστη:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Τίποτα"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "Λειτ. Σύστημα:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "Σε κάθε _μήνυμα"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 #, fuzzy
 msgid "One message _window:"
 msgstr "Αποστολή μηνύματος και κλείσιμο παραθύρου"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Άνοιγμα..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Εξερχόμενο μήνυμα:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "_Κωδικός:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Κωδικοφράση"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Κωδικός:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Παύση"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Προσωπικές Πληροφορίες"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Τηλέφωνο:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Αναπαραγωγή _ήχων"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Θύρα: "
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Θέση:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Τ.Κ.:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Πρόθεμα:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "μήνυμα κατάστασης"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Εμφάνιση χρόνου:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Π_ροτεραιότητα:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2884,60 +2940,52 @@ msgstr ""
 "είναι συνδεδεμένες χρησιμοποιώντας τον ίδιο λογαριασμό· Η εφαρμογή με την "
 "μεγαλύτερη προτεραιότητα λαμβάνει τα γεγονότα"
 
-#: ../src/gtkgui.glade.h:237
-msgid "Profile, Avatar"
-msgstr "Προφίλ, Avatar"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Πρωτόκολλο:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Μεσολαβητής:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Πρόσφατα:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Εγγραφή σε"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Αφαίρεση λογαριασμού μόν_ο από το Gajim"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Αφαίρεση λογαριασμού από το Gajim και από τον διακομι_στή"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Αφαίρεση της μεταφοράς αρχείου από τη λίστα."
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr ""
 "Αφαιρεί τις ολοκληρωμένες, ακυρωμένες και αποτυχημένες μεταφορές από τη λίστα"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Απάντηση σε αυτό το μήνυμα"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Επαναφορά Προεπιλεγμένων Χρωμάτων"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "_Πόρος: "
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2952,171 +3000,163 @@ msgstr ""
 "ίδια στιγμή. Ο πόρος με την μεγαλύτερη προτεραιότητα θα λαμβάνει τα "
 "γεγονότα. (βλέπε και πιο κάτω)"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Πόρος:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Ρόλος:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Ρυθμίσεις Δωματίου"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Δωμάτιο:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Αποθήκευση _κωδικοφράσης (περιορισμένη ασφάλεια)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Αποθήκευση _θέσης και μεγέθους για την λίστα επαφών και για τα παράθυρα "
 "κουβέντας"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Αποθήκευση Αρχείου ως..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Αποθήκευση ιστορι_κού συνομιλιών για όλες τις επαφές"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "_Αποθήκευση"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Search"
 msgstr "_Αναζήτηση"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "Α_ποστολή"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Αποστολή Αρχείου"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Αποστολή ενός _μηνύματος"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Αποστολή _Αρχείου"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "_Νέο Μήνυμα..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Αποστολή πακέτων keep-alive"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Αποστολή μηνύματος"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Αποστολή μηνύματος και κλείσιμο παραθύρου"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 msgid "Sends a message to currently connected users to this server"
 msgstr ""
 "Στέλνει ένα μήνυμα στους χρήστες που είναι συνδεδεμένοι σε αυτό το διακομιστή"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Διακομιστής:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Χαρακτηριστικά Διακομιστή"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Ορισμός MOTD"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Ορισμός Μηνύματος της Ημέρας"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Κα_θορισμός Avatar"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Θέλω να καθορίσω το άβαταρ μου όταν συνδεθώ"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Ορίζει το Μήνυμα της Ημέρας (MOTD)"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Εμφάνιση όλων των γεγονότων που εκρεμούν"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Εμφάνιση _Αποσυνδεδεμένων Χρηστών"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Εμφάνιση _Λίστας Επαφών"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Κονσόλα _XML"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Εμφά_νισε το μόνο στο κύριο παράθυρο"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Shows a list of file transfers between you and other"
 msgstr "Δείχνει τη λίστα μεταφορών αρχείων μεταξύ εσάς και άλλων"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "Σύν_δεση"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "Αποσ_ύνδεση"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Ταξινόμηση επαφών βάσει κατάστασης"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "Κατάσ_ταση"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Έναρξη _Συζήτησης"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Νομός:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Μήνυμα κατάστασης:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Κατάσταση:"
@@ -3147,25 +3187,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Συγχρο_νισμός κατάστασης λογαριασμού με την γενική κατάσταση"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Θέμα:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "Χρώμα _κειμένου:"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "Γρα_μματοσειρά Κειμένου:"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "Αυτόματο μήνυμα για κατάσταση απομακρυσμένος"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "Αυτόματο μήνυμα για κατάσταση μη διαθέσιμος"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Θέμα:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3191,50 +3232,56 @@ msgid "Type:"
 msgstr "Τύπος:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Υπογράμμιση"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "Ενημέρωση MOTD"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Ενημέρωση Μηνύματος της Ημέρας"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Ενημερώνει το Μήνυμα της Ημέρας (MOTD)"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Χρήση _SSL (για λόγους συμβατότητας)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "Χρήση σετ _εικονιδίων κατάστασης:"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Χρήση πιστοποίησης"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Χρήση προαρμοσμένου διακομιστή/θύρας"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "λίστα μεταφορών αρχείων"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "Ταυτότητα Χρήστη:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3247,21 +3294,21 @@ msgstr ""
 "Συμβάντα για νέα μηνύματα δημιουργούνται μόνο όταν λαμβάνονται μηνύματα από "
 "επαφές με τις οποίες δεν κουβεντιάζετε ήδη"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Όταν λαμβάνεται ένα νέο γεγονός"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Δουλειά"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3269,416 +3316,455 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό προτού μπορέσετε\n"
 "να συνδεθείτε στο Jabber"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Το JID σας:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Ενέργειες"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "_Προσθήκη Επαφής..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "_Προσθήκη στην Λίστα Επαφών"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Διεύθυνση:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Διαχειριστής"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Διαχειριστής"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "Για Προ_χωρημένους"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Μετά από χρόνο:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Εξουσιοδότηση"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "Χρώμα _Φόντου:"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Απαγόρευση Πρόσβασης"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Πριν από χρόνο:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "_Τοποθέτηση Σελιδοδείκτη για αυτό το Δωμάτιο"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Περιηγητής:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Ακύρωση"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "_Συμπαγής Όψη   Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "Α_ντιγραφή JID/Email Διεύθυνσης"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Αντιγραφή Τοποθεσίας Δεσμού"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Άρνηση"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "Εύρεση _Υπηρεσιών"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "Εύρεση _Υπηρεσιών..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_Συχνές Ερωτήσεις"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Διαχειριστής αρχείων:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Φιλτράρισμα:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Τέλος"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Γραμματοσειρά:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "_Ομαδική Συζήτηση"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "_Υπογράμμιση λέξεων με τυπογραφικά λάθη"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_Ιστορικό"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Αγνόησε γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Εισερχόμενο μήνυμα:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "Σύνδεση σε _Νέο Δωμάτιο..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "_Ξεφορτώσου τον"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "_Καταγραφή ιστορικού κουβέντας"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "_Εφαρμογή Αλληλογραφίας:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Μέλος"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "_Συνένωση λογαριασμών"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Μήνυμα"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Τροποποίηση"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "_Επεξεργασία Λογαριασμού..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Όνομα: "
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Ποτέ"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "_Ειδοποίησε με για αυτό"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_Εντάξει"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "_Ενέργειες για τους Συμμετέχοντες"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "_Συνδεδεμένοι Χρήστες"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Άνοιγμα Προγράμματος Αλληλογραφίας"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Άνοιγμα Δεσμού σε Περιηγητή"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Άνοιγμα..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Εξερχόμενο μήνυμα:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "_Ιδιοκτήτης"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Κωδικός:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Παύση"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Αναπαραγωγέας:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Εμφάνισε το"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Θύρα:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Προτιμήσεις"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Παρουσία"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Δημοσιοποίηση"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Έξοδος"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Αφαίρεση"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "Α_φαίρεση από την Λίστα Επαφών"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Απάντηση"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Επαναφορά Προεπιλεγμένων Χρωμάτων"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Ανάκτηση"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Κωδικός:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Αναζήτηση"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "_Αποστολή"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "_Αποστολή & Κλείσιμο"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "_Αποστολή Προσωπικού Μηνύματος"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "_Αποστολή Μηνύματος Διακομιστή"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "_Αποστολή Μονού Μηνύματος"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Διακομιστής:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Ταξινόμηση επαφών βάσει κατάστασης"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "_Έναρξη κουβέντας"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Κατάσταση"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Μήνυμα κατάστασης:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Εγγραφή"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Εγγραφή"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+msgid "_URL:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Χρήση μεσολαβητή"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "_Όνομα χρήστη:"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Φωνή"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "Κονσόλα _XML..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "λίστα μεταφορών αρχείων"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "λεπτά"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Σφάλμα: το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Σφάλμα κατά τη ανάλυση του αρχείου:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Αδυναμία εγγραφής στο %s. Δεν θα υπάρξει υποστήριξη για τον διαχειριστή "
 "συνεδριών"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Αναζήτηση"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Διαγραφή MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Αναζήτηση"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3687,36 +3773,36 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Μεταφορά Ιστορικού..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Ημερομηνία"
@@ -3750,75 +3836,81 @@ msgstr "Η κατάσταση είναι τώρα: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Μήνυμα"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Έναργξη Κουβέντας με χρήση του λογαριασμού %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Συνενωμένοι λογαριασμοί"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 #, fuzzy
 msgid "Observers"
 msgstr "Διακομιστής"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Δεν μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εάν είστε αόρατος"
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "_Σύνδεση σε Νέο Δωμάτιο"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Διαχείριση Σελιδοδεικτών..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "στον λογαριασμό %s"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "χρήση του λογαριασμού %s"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "με χρήση του λογαριασμού %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Διαχείριση Σελιδοδεικτών..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "για τον λογαριασμό %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_Ιστορικό"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "_Σύνδεση σε Νέο Δωμάτιο"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3826,68 +3918,77 @@ msgstr ""
 "Δεν θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Επιλέξτε το κλειδί που θέλετε να εφαρμόσετε στην επαφή"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "_Μετονομασία"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "_Σύνδεση"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "_Αποσύνδεση"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "Α_λλαγή Μηνύματος Κατάστασης"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#: ../src/roster_window.py:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από την λίστα επαφών σας"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
+"συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3895,37 +3996,37 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 msgid "I want this contact to know my status after removal"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Απαιτείται κωδικοφράση"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Πληκτρολογήστε την GPG κωδικοφράση για το λογαριασμό %s"
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Αποθήκευση της Κωδικοφράσης"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Κωδικοφράση"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3933,21 +4034,21 @@ msgstr ""
 "Εάν αλλάξετε την κατάστασή σας σε αόρατη, θα αποσυνδεθείτε από αυτές τις "
 "ομαδικές συζητήσεις. Είστε σίγουρος/η ότι θέλετε να γίνεται αόρατος/η;"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3955,152 +4056,139 @@ msgstr ""
 "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
 "ενεργοποιημένο το ιστορικό."
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Από %s στο δωμάτιο %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Αποστολή αρχείου σε μία επαφή"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Αλλαγή Μηνύματος Κατάστασης..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "Αλλαγή Μηνύματος _Κατάστασης..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Απόκρυψη αυτού του μενού"
 
-#: ../src/systray.py:264
-msgid "All contacts in this group are offline or have errors"
-msgstr ""
-"Όλες οι επαφές σε αυτή την ομάδα είναι αποσυνδεδέμενες ή έχουν πρόβλημα"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %d μη αναγνωσμένο μήνυμα"
 msgstr[1] "Gajim - %d μη αναγνωσμένα μηνύματα"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - %d μη αναγνωσμένο μεμονωμένο μήνυμα"
 msgstr[1] "Gajim - %d μη αναγνωσμένα μεμονωμένα μηνύματα"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - %d μη αναγνωσμένο μήνυμα"
 msgstr[1] "Gajim - %d μη αναγνωσμένα μηνύματα1"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - %d μη αναγνωσμένο προσωπικό μήνυμα"
 msgstr[1] "Gajim - %d μη αναγνωσμένα προσωπικά μηνύματα"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Ρόλος: "
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Συσχέτιση: "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Κατάσταση: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Πόρος: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Κατάσταση: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Εγγραφή: "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "_Σετ εικονιδίων κατάστασης:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Mέγεθος: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Τύπος: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Λήψη"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Αποστολή"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Mέγεθος: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Τύπος: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Μεταφέρθηκαν: "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Δεν έχει ξεκινήσει"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Διακόπηκε"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Παύση"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Πάγωσε"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Μεταφέρεται"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Αυτή η υπηρεσία δεν έχει απαντήσει ακόμα με λεπτομερείς πληροφορίες"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4108,33 +4196,33 @@ msgstr ""
 "Αυτή η υπηρεσία δεν μπόρεσε να απαντήσει με λεπτομερείς πληροφορίες.\n"
 "Είναι είτε χαλασμένη είτε πεπαλαιωμένη."
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Επιλογή Εικόνας"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Εικόνες"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "Άγνωστος"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "Άγνωστο"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Περιήγηση στο %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4142,7 +4230,7 @@ msgstr ""
 "Αυτή η επαφή ενδιαφέρεται για την παρουσία σας ή μη, αλλά εσείς δεν "
 "ενδιαφέρεστε για την παρουσία του/της"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4150,12 +4238,12 @@ msgstr ""
 "Εσείς ενδιαφέρεστε για την παρουσία αυτής της επαφής, αλλά αυτός/η δεν "
 "ενδιαφέρεται για τη δική σας"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4163,26 +4251,26 @@ msgstr ""
 "Δεν ενδιαφέρεστε για την παρουσία ή μη της επαφής, και ούτε αυτός/η "
 "ενδιαφέρεται για εσάς"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Περιμένετε την απάντηση της επαφής για την αίτηση συνδρομής σας"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να δημοσιεύσετε τις πληροφορίες της επαφής "
 "σας"
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να λάβετε τις πληροφορίες της επαφής σας"
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 #, fuzzy
 msgid "Personal details"
 msgstr "Προσωπικές Πληροφορίες"
@@ -4229,49 +4317,51 @@ msgstr ""
 "λείπει"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "To Session bus δεν είναι διαθέσιμο"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Χρήση του D-Bus και του δαίμονα ειδοποιήσεων για εμφάνιση ειδοποιήσεων"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε "
 "απομακρυσμένος."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Απομακρυσμένος λόγω αδράνειας"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε μη "
 "διαθέσιμος."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Μη διαθέσιμος λόγω αδράνειας"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Αν είναι αληθές, μην αφαιρείς */_. Έτσι το *αβγ* θα είναι μεν έντονο αλλά τα "
 "* * δεν θα αφαιρεθούν."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Να προστεθεί * και [n] στον τίτλο της λίστας επαφών;"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4279,12 +4369,12 @@ msgstr ""
 "Πόσες γραμμές από την προηγούμενη συζήτηση θα εμφανίζονται όταν θα "
 "ξανανοίξει μια καρτέλα/παράθυρο κουβέντας."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Πόσα λεπτά θα παραμείνουν οι τελευταίες γραμμές από την προηγούμενη συζήτηση."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4292,20 +4382,20 @@ msgstr ""
 "Αποστολή μηνύματος με Ctrl+Enter και εισαγωγή νέας γραμμής με το Enter (Εξ "
 "ορισμού συμπεριφορά του πελάτη ICQ της Mirabilis)."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Πόσες γραμμές να αποθηκευτούν για το Ctrl+KeyUP."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Να χρησιμοποιείται η συμπαγής όψη όταν ανοίγετε ένα παράθυρο κουβέντας"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Χρήση συμπαγούς προβολής κατά το άνοιγμα παραθύρου ομαδικής κουβέντας"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4314,31 +4404,31 @@ msgstr ""
 "Είτε δικό σας url με ένα %s σε αυτό όπου %s είναι η λέξη/φρράση ή "
 "'WIKTIONARY' που σημαίνει να γίνεται χρήση του wiktionary."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Εαν είναι επιλεγμένο, το Gajim μπορεί να ελεγθεί από μακριά χρησιμοποιόντας "
 "το gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4346,30 +4436,30 @@ msgstr ""
 "Προέχει του κεντρικού υπολογιστή που αποστέλουμε για Μεταφορές Αρχείων σε "
 "περίπτωση που υπάρχει μετάφραση διεύθυνσης/προώθηση πόρτας"
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Το IEC standard υπαγορεύει ότι ΚιΒ = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Να εμφανίζεται καρτέλα όταν υπάρχει μόνο μια κουβέντα;"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Να εμφανίζεται καρτέλα εάν υπάρχει μόνο μια κουβέντα;"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Προβολή κουμπιού κλεισίματος στην καρτέλα;"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr ""
 "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται "
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4378,11 +4468,11 @@ msgstr ""
 "παραθύρων. Αυτή η ρύθμιση έχει νόημα μόνο εφόσον γίνεται χρήση εικονιδίου "
 "στην μπάρα ειδοποιήσεων."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Αν είναι αληθές, το Gajim καταχωρείται στο xmpp:// σε κάθε έναρξη του."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4391,7 +4481,7 @@ msgstr ""
 "έχει μη αναγνωσμένα μηνύματα. Σε μερικά θέματα, αυτό το εικονίδιο έχει "
 "κίνηση."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4399,7 +4489,7 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα εμφανίζει το μήνυμα κατάστασης, εφόσον δεν "
 "είναι άδειο, για κάθε επαφή κάτω από το όνομα επαφής στην λίστα επαφών"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4408,7 +4498,7 @@ msgstr ""
 "άβαταρ, έχει τώρα"
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4417,20 +4507,20 @@ msgstr ""
 "παράθυρα συζητήσεων όταν η επαφή αλλάζει την κατάσταση και/ή τo μύνημα "
 "κατάστασης."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4441,14 +4531,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
@@ -4517,184 +4618,99 @@ msgstr ""
 "Ο ήχος που θα παιχθεί όταν ληφθεί οποιοδήποτε μήνυμα MUC. (Αυτή η ρύθμιση "
 "ισχύει μόνο εάν είναι ορισμένη η notify_on_all_muc_messages)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "πράσινο"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "μανάβικο"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "ζεστό"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr ""
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "λιτό"
-
-#: ../src/common/connection.py:68
-#, fuzzy
-msgid "Unable to load idle module"
-msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτό το δωμάτιο."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτό το δωμάτιο."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Δεν υπάρχει τέτοιο δωμάτιο."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "Δεν επιτρέπεται η δημιουργία δωματίων."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Δεν είστε στη λίστα μελών."
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
-"Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-msgid "I would like to add you to my roster."
-msgstr "Επιθυμώ να σε προσθέσω στην λίστα επαφών μου."
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "Ο %s μόλις σας εξουσιοδότησε"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
 "επανασυνδεθείτε."
 
-#: ../src/common/connection.py:1464
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"Το Jid %s δεν είναι σύμμορφο προς το RFC. Δεν θα προστεθεί στη λίστα επαφών "
-"σας. Χρησιμοποιήστε κάποιο εργαλείο διαχείρισης όπως το http://jru."
-"jabberstudio.org για να το αφαιρέσετε"
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Μη έγκυρος κωδικός"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Μη έγκυρος κωδικός"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη."
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Έγινε σύνδεση με το διακομιστή %s:%s με %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Ελέγξτε την σύνδεση σας ή δοκιμάστε αργότερα"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 msgid "Please check your login and password for correctness."
 msgstr "Παρακαλώ ελέγξτε το συνθηματικό σας."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "Δεν δόθηκε κωδική-φράση για το OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "αόρατος"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "αποσυνδεδεμένος"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Είμαι %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4703,209 +4719,206 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr ""
-"Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
-"%s"
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
+msgstr "Επιθυμώ να σε προσθέσω στην λίστα επαφών μου."
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του χρήστη"
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Απαιτείται η διεύθυνση του διακομιστή:"
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του διακομιστή."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Μη έγκυρος χαρακτήρας στον πόρο."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "Απα_σχολημένος"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Απασχολημένος"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_Μη διαθέσιμος"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Μη διαθέσιμος"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "Διαθέσιμος για _Κουβέντα"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Διαθέσιμος για Κουβέντα"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "_Διαθέσιμος"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Διαθέσιμος"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Συνδέεται"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "Α_πομακρυσμένος"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Απομακρυσμένος"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "Απ_οσυνδεδεμένος"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Αποσυνδεδεμένος"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "Αόρατ_ος"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Αφανής"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "Άγνωστη"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "Έχει σφάλμα"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "Καμία"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "Προς"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "Από"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Και τα δυο"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "Τίποτα"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "Κανένας"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Διαχειριστές"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Διαχειριστής"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Συμμετέχοντες"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Συμμετέχων"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Επισκέπτες"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Επισκέπτης"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "έχει την προσοχή του στην κουβέντα"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "κάνει κάτι άλλο"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "γράφει ένα μήνυμα..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 
@@ -4915,10 +4928,110 @@ msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 msgid "error: cannot open %s for reading"
 msgstr "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "λιτό"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "κυανό"
 
+#~ msgid "Send"
+#~ msgstr "Αποστολή"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr "Ο/Η %(nickname)s στο δωμάτιο %(room_name)s σας έστειλε ένα μήνυμα."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "Ο/Η %s σας έστειλε ένα νέο μήνυμα."
+
+#, fuzzy
+#~ msgid "GUI Migration failed"
+#~ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "Το ιστορικό έχει μεταφερθεί στη βάση δεδομένων με επιτυχία."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr ""
+#~ "Αν επιλεγεί, το Gajim θα έχει δικό του εικονίδιο στην περιοχή "
+#~ "γνωστοποίησης"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Προφίλ, Avatar"
+
+#~ msgid "_Online Users"
+#~ msgstr "_Συνδεδεμένοι Χρήστες"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Έναργξη Κουβέντας με χρήση του λογαριασμού %s"
+
+#~ msgid "All contacts in this group are offline or have errors"
+#~ msgstr ""
+#~ "Όλες οι επαφές σε αυτή την ομάδα είναι αποσυνδεδέμενες ή έχουν πρόβλημα"
+
+#~ msgid "Size: "
+#~ msgstr "Mέγεθος: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "To Session bus δεν είναι διαθέσιμο"
+
+#, fuzzy
+#~ msgid "Unable to load idle module"
+#~ msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτό το δωμάτιο."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτό το δωμάτιο."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Δεν υπάρχει τέτοιο δωμάτιο."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "Δεν επιτρέπεται η δημιουργία δωματίων."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Δεν είστε στη λίστα μελών."
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
+#~ "Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "Ο %s μόλις σας εξουσιοδότησε"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "Το Jid %s δεν είναι σύμμορφο προς το RFC. Δεν θα προστεθεί στη λίστα "
+#~ "επαφών σας. Χρησιμοποιήστε κάποιο εργαλείο διαχείρισης όπως το http://jru."
+#~ "jabberstudio.org για να το αφαιρέσετε"
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr ""
+#~ "Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την "
+#~ "μεταφορά %s"
+
 #~ msgid "Sound"
 #~ msgstr "Ήχος"
 
@@ -5062,9 +5175,6 @@ msgstr "κυανό"
 #~ msgid "with account "
 #~ msgstr "λογαριασμός: "
 
-#~ msgid "New Message as %s"
-#~ msgstr "Νέο Μήνυμα ως %s"
-
 #~ msgid "Chat with"
 #~ msgstr "Κουβέντα με"
 
diff --git a/po/es/LC_MESSAGES/gajim.po b/po/es/LC_MESSAGES/gajim.po
index 232b12264..d8a6590b5 100644
--- a/po/es/LC_MESSAGES/gajim.po
+++ b/po/es/LC_MESSAGES/gajim.po
@@ -4,12 +4,12 @@
 # This file is distributed under the same license as the gajim package.
 # Automatically generated, 2004.
 # 
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2005-05-21 20:03+0100\n"
 "Last-Translator: Membris Khan <membriskhan@gmail.com>\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid "Hidden"
 msgstr "Oculta"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -70,62 +70,59 @@ msgstr ""
 "El resalto de palabras mal escritas no será usado"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "No hay disponible una conexión"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 msgid "Your message can not be sent until you are connected."
 msgstr "Tu mensaje no será enviado mientras no estés conectado."
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Charla"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Charla"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "Encriptación OpenPGP"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s no ha revelado su clave OpenPGP ni tú le has asignado una"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Encriptación activada"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Encriptación desactivada"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "no está en el roster"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -133,20 +130,20 @@ msgstr ""
 "Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
 "perderá."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Cada %s _minutos"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -194,199 +191,212 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "GPG no es usable en este ordenador"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "El nombre de la cuenta no puede estar vacío."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 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:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Entrada no válida"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "No está disponible dicha cuenta"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 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:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 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:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
 
-#: ../src/config.py:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptación OpenPGP"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Ninguna clave seleccionada"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 #, fuzzy
 msgid "Member List"
 msgstr "_Miembro"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 #, fuzzy
 msgid "Owner List"
 msgstr "_Propietario"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr ""
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 #, fuzzy
 msgid "Role"
 msgstr "Puesto:"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 #, fuzzy
 msgid "Banning..."
 msgstr "Expulsando a %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -396,77 +406,87 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "La cuenta \"%s\" está conectada al servidor"
-
-#: ../src/config.py:2097
-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:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "La cuenta \"%s\" está conectada al servidor"
+
+#: ../src/config.py:2136
+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:2269
 msgid "New Room"
 msgstr "Nuevo salón"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 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:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr "Debes proporcionar un nombre para configurar esta cuenta."
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Contraseña no válida"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 msgid "You must enter a password for the new account."
 msgstr "Debes introducir una contraseña para la nueva cuenta"
 
-#: ../src/config.py:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "Las contraseñas escritas en ambos campos deben ser idénticas."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "ID de Jabber no válida"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Este contacto ya está listado en tu roster."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido añadida con éxito"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -475,19 +495,19 @@ msgstr ""
 "Avanzado, o más tarde mediante el submenú Cuentas del menú Editar de la "
 "ventana principal."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Tu nueva cuenta ha sido creada con éxito"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
@@ -546,163 +566,162 @@ msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Los enlaces D-Bus de python no se encuentran en este ordenador"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Las capacidades D-Bus de Gajim no pueden ser usadas"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Nombre del contacto : <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Transportes"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "En el grupo"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Nombre de contacto"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaje de estado %s"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Mensajes de estado predefinidos</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Escribe tu nuevo mensaje de estado:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, introduce la inforamción del contacto que quieres añadir a la "
 "cuenta %s"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor, rellena la información del contacto que quieres añadir"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Transportes"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "ID de Usuario no válida"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Contacto ya presente en el roster"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto ya está listado en tu roster."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr "créditos de traducción"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Petición de adición para la cuenta %s de %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Petición de adición de %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 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:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar a un salón de chat con la cuenta %s"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Entrar a un salón de chat"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "Nombre de usuario no válido"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversación con la cuenta %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -711,158 +730,165 @@ msgstr ""
 "un mensaje de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexión, no puedes cambiar tu contraseña."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseña."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Nuevo mensaje"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Nuevo mensaje privado"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Petición de transferencia de archivo"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Error en la transferencia del archivo"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Transferencia del archivo finalizada"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Transferencia del archivo detenida"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 #, fuzzy
 msgid "New E-mail"
 msgstr "Correo-e"
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Petición de transferencia de archivo"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Error en la transferencia del archivo"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Transferencia del archivo finalizada"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Transferencia del archivo detenida"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "Ninguno"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Mensaje:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s invitado a %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Others"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Sin una conexión no puedes navegar los servicios disponibles"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestión de servicios usando la cuenta %s"
@@ -871,11 +897,11 @@ msgstr "Gestión de servicios usando la cuenta %s"
 msgid "Service Discovery"
 msgstr "Gestión de servicios"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "El servicio no fue encontrado"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -883,175 +909,176 @@ msgstr ""
 "No hay servicio en la dirección introducida, o no está respondiendo. "
 "Comprueba la dirección e inténtalo de nuevo."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "El servicio no es navegable"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de servicio no contiene ningún elemento a navegar."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "usando la cuenta %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Escaneando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Descripción"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Archivo"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Nombre de archivo: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaño: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Tú"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Recipiente: "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Guardado en: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Transferencia de archivo finalizada"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Abrir carpeta contenedora"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Transferencia de archivo cancelada"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "La conexión con el cliente no se pudo establecer."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Transferencia de archivo detenida por el contacto de la otra parte"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Elige archivo a enviar..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Enviar"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "_Enviar"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim no puede acceder a este archivo"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Este archivo está siendo usado por otro proceso."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Este archivo ya existe"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Archivo: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quiere enviarte un archivo:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Guardar archivo como..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "¿Quieres sobreescribirlo?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr ""
@@ -1059,7 +1086,7 @@ msgstr ""
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr ""
@@ -1076,12 +1103,12 @@ msgstr "Archivo: "
 msgid "It is not possible to send empty files"
 msgstr "No es posible enviar archivos vacíos"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Remitente: "
 
@@ -1089,32 +1116,32 @@ msgstr "Remitente: "
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Continuar"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "muestra ayuda sobre un comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "mostrar ayuda sobre un comando"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Muestra u oculta la ventana de la lista de contactos"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Levanta una venana con el siguiente mensaje sin leer"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1122,45 +1149,45 @@ msgstr ""
 "Muestra una lista de todos los contactos en el roster. Cada contacto aparece "
 "en una línea distinta"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "cuenta"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "mostrar sólo contactos de la cuenta especificada"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Muestra una lista de cuentas registradas"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Cambia el estado de una o varias cuentas"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "uno de: desconectado, en línea, libre para hablar, ausente, no disponible, "
 "ocupado, invisible"
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "mensaje"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "ensaje de estado"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1169,19 +1196,19 @@ msgstr ""
 "cambiar el estado de todas las cuentas que tienen la opción \"sync with "
 "global status\" activada"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Muestra el diálogo de conversación para enviar mensajes a un contacto"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contacto con el que quieres conversar"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "si es especificado, el contacto es obtenido de la lista de esta cuenta"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1191,128 +1218,128 @@ msgstr ""
 "clave OpenPGP como la cuenta son opcionales. Si quieres definir sólo "
 "'cuenta' sin 'clave pgp', sólo define 'clave pgp' a ''."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "la JID del contacto que recibirá el mensaje"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "contenido del mensaje"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "clave pgp"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "si es especificado, el mensaje será encriptado usando su clave pública"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "si es especificado el mensaje será enviado a través de esta cuenta"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Obtener información detallada de un contacto"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID del contacto"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Obtener información detallada de un contacto"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "No tienes cuentas activas"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Enviar archivo a un contacto"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "archivo"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Ruta del archivo"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "si es especificado el archivo será enviado usando esta cuenta"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Lista todas las preferencias y sus valores"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define el valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'entrada' es el nombre de la preferencia, 'valor' es el valor a definir"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "entrada"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "nombre de la preferencia a eliminar"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escribe el estado actual de la preferencias de Gajim al archivo de "
 "configuración"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Elimina contacto del roster"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Añade contacto al roster"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Añade nuevo contacto a esta cuenta."
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Devuelve el estado actual (el global si no se especifica una cuenta)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr "Devuelve el estado actual (el global si no se especifica una cuenta)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "No se encuentra el argumento \"contact_jid\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1321,16 +1348,16 @@ msgstr ""
 "'%s' no está en tu lista de contactos.\n"
 "Por favor, especifica una cuenta para enviar el mensaje."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "No tienes cuentas activas"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Versión de D-Bus desconocida: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1339,16 +1366,16 @@ msgstr ""
 "Modo de uso: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s no encontrado"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1357,7 +1384,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando es uno de:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1366,31 +1393,31 @@ msgstr ""
 "El argumento \"%s\" no se ha especificado. \n"
 "Escribe \"%s help %s\" para más información"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim necesita Xserver para funcionar. Abortando..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim necesita PyGTK 2.6 o superior"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim necesita PyGTK 2.6 o superior para funcionar. Abortando..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim necesita GTK 2.6 o superior"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim necesita GTK 2.6 o superior para funcionar. Abortando..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "La biblioteca GTK+ necesita soporte de libglade"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1399,7 +1426,7 @@ msgstr ""
 "Por favor elimina tu actual biblioteca GTK+ e instala la última versión "
 "estable desde %s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -1407,127 +1434,146 @@ msgstr ""
 "Por favor, asegúrate de que gtk y pygtk tienen soporte de libglade en este "
 "sistema."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necesita PySQLite2 para funcionar"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autorización HTTP (%s) para %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "¿Aceptas esta petición?"
 
-#: ../src/gajim.py:498
-#, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "%(nickname)s en el salón %(room_name)s te ha enviado un nuevo mensaje"
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Contacto conectado"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s te ha enviado un nuevo mensaje"
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Contacto desconectado"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Nuevo mensaje privado"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nuevo mensaje"
+
+#: ../src/gajim.py:610
+#, fuzzy, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nuevo mensaje como %s "
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "error durante el envío"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "El contacto \"%s\" te ha autorizado a ver su estado."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "El contacto \"%s\" eliminó su subscripción de tí"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Siempre le verás desconectado."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "No se ha podido establecer contacto con \"%s\""
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Comprueba tu conexión o reinténtalo más tarde."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s está ahora %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Contraseña incorrecta"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Estás actualmente conectado sin tu clave GPG"
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] "Tienes mensajes sin leer"
 msgstr[1] "Tienes mensajes sin leer"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quiere enviarte un archivo."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Has recibido con éxito el archivo %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Has enviado con éxito el archivo %(filename)s a %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferencia de %(filename)s a %(name)s detenida."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "vCard publicada con éxito"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Tu información personal ha sido publicada con éxito"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "falló la publicación de la vCard"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1537,159 +1583,143 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: ../src/gajim.py:1719
-#, fuzzy
-msgid "GUI Migration failed"
-msgstr "falló la publicación de la vCard"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "El registro ha sido migrado satisfactoriamente a la base de datos"
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Soporte de manejo de sesión no disponible (falta el módulo gnome.ui)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Migrando el registro..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Por favor, espera mientras el registro está siendo migrado..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Tema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "nombre del tema"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "No puedes eliminar el tema actual"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primero elige otro distinto como tema actual."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar conversación"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Falló el envío del mensaje privado"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, 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/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Grupos de charla"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Este salón no tiene tema"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s es ahora conocido como %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s está ahora %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alias no encontrado: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s invitado a %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s no parece ser un JID válido"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "No existe el comando: /%s (si quieres enviar este prefijo con /say)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1702,7 +1732,7 @@ msgstr ""
 "actualmente en el salón, el/ella puede ser también expulsado. NO soporta "
 "espacio en el alias."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1710,12 +1740,12 @@ msgstr ""
 "Uso: /%s <alias>, abre una ventana de conversación con el ocupante "
 "especificado."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, limpia de texto la ventana."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1724,12 +1754,12 @@ msgstr ""
 "Uso: /%s [motivo], cierra la ventana o pestaña actual, mostrando el motivo "
 "si se especifica."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Uso: /%s, cambia la ventana de salón a modo compacto."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1738,7 +1768,7 @@ msgstr ""
 "Uso: /%s <JID> [reason], invita al JID al salón actual, opcionalmente "
 "proveyendo un motivo."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1747,7 +1777,7 @@ msgstr ""
 "Uso: /%s <salón>@<servidor>[/alias], ofrece la entrada a salón@servidor "
 "opcionalmente usando el alias especificado"
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1757,7 +1787,7 @@ msgstr ""
 "Uso: /%s <alias> [motivo], elimina del salón al ocupante especificado por el "
 "alias y opcionalmente muestra un motivo. NO soporta espacios en el alias."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1766,7 +1796,7 @@ msgstr ""
 "Uso: /%s <acción>, envía una acción al salón actual. Usa la tercera persona. "
 "(p.ej. /%s grita.)"
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1775,86 +1805,86 @@ msgstr ""
 "Uso: /%s <alias> [message], abre una ventana de conversación privada y envía "
 "un mensaje al ocupante especificado por el alias."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Uso: /%s <alias>, cambia tu alias en el salón actual."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Uso: /%s [tema], muestra o actualiza el tema actual del salón."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Uso: /%s <mensaje>, envía un mensaje sin buscar otros comandos."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "No hay información de ayuda para /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "¿Estás seguro de querer abandonar el salón \"%s\"?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Si cierras esta ventana, serás desconectado de este salón."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_No preguntarme otra vez"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Cambiando el tema"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Especifica el nuevo tema:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Cambiando alias"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifica el nuevo alias que quieres usar:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Marcador ya definido"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "El salón \"%s\" ya se encuentra en tus marcadores."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Marcador añadido con éxito"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Puedes gestionar tus marcadores mediante el menú Acciones de tu roster"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
@@ -1902,111 +1932,120 @@ msgstr "<b>Editor de configuración avanzada</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Programas</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Personalizado</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Descripción</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Formato del renglón</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Personalización de la interfaz</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Tráfico de Jabber</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Miscelánea</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Información personal</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Por favor, elige una de las siguientes opciones:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Por favor, introduce los datos para tu nueva cuenta</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Por favor, elige una de las siguientes opciones:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Mensajes de estado predefinidos</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Propiedades</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Configuración</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Sonidos</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Escribe tu nuevo mensaje de estado:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notificationes Visuales</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada de XML</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Una lista de transferencias activas, finalizadas y detenidas"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "_Cuentas"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Después del nombre:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "Acerca de"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2018,52 +2057,44 @@ msgstr ""
 "Contacto\n"
 "Banner"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Modificar cuenta"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "Acciones A_vanzadas"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Añadir un contacto"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Notificationes Visuales</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Añadir un _Contacto"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Dirección"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Editor avanzado de configurción"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Después del nombre:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Después de la hora:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2073,57 +2104,57 @@ msgstr ""
 "Sólo componiendo\n"
 "Desactivado"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Permitir envío de información sobre el sistema operativo"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Permitirle ver mi estado"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Permitir notificaciones emergentes cuando estoy _ausente, no disponible, "
 "ocupado o invisible."
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "También conocido como estilo iChat"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Preguntar mensaje de estado cuando esté: "
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Pregunta para ver su estado"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Pregunta:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorizar contacto para que pueda saber cuándo estás conectado"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Poner _ausente después de:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Poner _no disponible después de:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Auto conectar"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2135,15 +2166,15 @@ msgstr ""
 "Siempre usar las apliacciones por defecto de KDE\n"
 "Personalizado"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Autorizar contactos automáticamente"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Autoreconectar si se pierde la conexión"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2156,13 +2187,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Antes del nombre:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Antes de la hora:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Antes del nombre:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2279,134 +2307,138 @@ msgid "Company:"
 msgstr "Compañía:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Configurar el salón"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Conectar cuando presione Finalizar"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Conexión"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Información"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "_Información"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "Histórico de conversaciones"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "País:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "_Iconos de estado por defecto:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Eliminar MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Eliminar mensaje del día"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Elimiina mensaje del día"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Denegar autorización de contacto para que no pueda saber cuándo estás "
 "conectado"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Departamento:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Mostrar en el roster los avatares de los contactos"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Mostrar en el roster los mensajes de estado de los contactos"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "Correo-e:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "Cada 5 _minutos"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Editar grupos"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "_Editar información personal personales..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Editar grupos"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Gestionar emoticonos"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Activar"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Introdúcela de nuevo para confirmar:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Introduce nueva contraseña:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Eventos"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "Cada 5 _minutos"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Segunda dirección:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Familia:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Transferencias"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "_Transferencias"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Administrador de archivos:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Filtro:"
@@ -2416,39 +2448,35 @@ msgid "Font style:"
 msgstr "Estilo:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Fuente:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Prohibirle ver mi estado"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Preguntas frecuentes (en línea)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "De:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "I_r"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Personalización de temas de Gajim"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2458,7 +2486,7 @@ msgstr ""
 "Gajim puede enviar y recibir meta-información relacionada con una "
 "conversación que puedas tener con un contacto"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2466,7 +2494,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:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2475,7 +2503,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:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2483,7 +2511,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:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2491,25 +2519,33 @@ msgstr ""
 "Gajim notificará con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se desconecte"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim sólo cambiará el icono del contacto que envía el nuevo mensaje"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Asistente para crear una cuenta"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "General"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Nombre de pila:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Ninguno"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Grupo:"
@@ -2557,20 +2593,24 @@ 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:170
-msgid "If checked, Gajim will also have a trayicon"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
 msgstr ""
-"Si está marcado, Gajim alojará un icono en el área de notificación del "
-"sistema"
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 "Si está marcado, Gajim mostrará los avatares de los usuarios en el roster"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Si está marcado, Gajim mostrará los mensajes de estado de los contactos "
 "debajo de cada nombre en el roster"
@@ -2653,8 +2693,9 @@ msgstr ""
 "contactos de forma mixta"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Mensaje entrante:"
+#, fuzzy
+msgid "Inactive"
+msgstr "Activo"
 
 #. 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:185
@@ -2690,39 +2731,57 @@ msgid "Location"
 msgstr "Dirección"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Mensaje"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Gestionar..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Gestionar cuentas"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Gestionar marcadores"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Gestionar perfiles del Proxy"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Gestionar..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Medio:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Más"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2730,109 +2789,105 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Alias:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Ninguno"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Notificar cuand un contacto: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "SO:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "En cada _mensaje"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 #, fuzzy
 msgid "One message _window:"
 msgstr "Enviar mensaje y cerrar ventana"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Abrir..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Mensaje saliente:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "_Contraseña: "
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Contraseña"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Contraseña: "
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Pausado"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Teléfono:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Reproducir _sonidos"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Puerto: "
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Posición:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Código postal:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Preferencias"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Prefijo"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "ensaje de estado"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Insertar la hora:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Pr_ioridad:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2842,60 +2897,52 @@ 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:237
-msgid "Profile, Avatar"
-msgstr "Perfil, Avatar"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Proxy"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Constructor de consultas..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Recientemente:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Registrar en"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Eliminar la _cuenta únicamente de Gajim"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Eliminar la cuenta de Gajim y del _servidor"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Eliminar transferencias de la lista"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr ""
 "Elimina de la lista las transferencias finalizadas, canceladas y fallidas"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Responder a este mensaje:"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Restablecer colores por defecto"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "Re_curso: "
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2910,170 +2957,162 @@ msgstr ""
 "tiempo. El recurso que tenga la prioridad más alta será el que reciba los "
 "eventos (mira más abajo)."
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Puesto:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Configuración del salón"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Salón:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Guardar contraseña (inseguro)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Guarda _posición y tamaño para las ventanas de conversaciones y lista de "
 "contactos"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Guardar archivo como..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Grabar conversaciones para todos los contactos"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "_Guardar contraseña"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Search"
 msgstr "_Buscar"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "Enviar"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Enviar mensaje"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Enviar archivo"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Enviar _nuevo mensaje..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Enviar paquetes de mantenimiento de actividad"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Enviar mensaje y cerrar ventana"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 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:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Características de los servidores"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Definir MOTD"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Definir mensaje del día"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Definir Avatar"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Definir un avatar cuando me conecte"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Define el mensaje del día"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Mostrar todos los _eventos pendientes"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Mostrar contactos desconectados"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Mostrar _roster"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Mostrar consola _XML"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Sólo mostrar en la _lista de contactos"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 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:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "Conectar"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Ordenar contactos por estado"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "Es_tado"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Estado:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Estado"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Mensaje de estado:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Estado:"
@@ -3104,25 +3143,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizar el estado de la cuenta con el estado global"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Tema:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "_Color del texto:"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "_Fuente del texto:"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "El mensaje de estado de auto-ausencia"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "El mensaje de estado de no auto-no disponible"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Tema:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3148,51 +3188,57 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Subrayado"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "Actualizar MOTD"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Actualizar mensaje del día"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Actualiza el mensaje del día"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (el viejo)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "_Usar los iconos del transporte"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Usar autentificación"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Usar nombre de host y puerto personalizados"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "lista de transferencias"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Icono en el área de notificación"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "Identificador:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Cuando una transferencia se completa, muestra una notificación emergente"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3205,435 +3251,474 @@ msgstr ""
 "nuevo mensaje sólo aparecen cuando proceden de un contacto con el que no se "
 "está hablando ya"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Cuando se reciba un nuevo evento"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
 msgstr "Debes tener una cuenta antes de conectar a la red Jabber"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Tu JID"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Acciones"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "_Añadir contacto..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "_Añadir a la lista de contactos"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Dirección:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Administrar"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "_Avanzado"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Después de la hora:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Autorizar"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "_Fondo"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Banear"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Antes de la hora:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "Añadir este salón a marcadores"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "Vista _compacta    Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Contenidos"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "_Copiar la dirección"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Copiar la dirección del enlace"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Descubrir servicios"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Descubrir servicios..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Administrador de archivos:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Finalizar"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Fuente:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "_Grupos de charla"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "_Resaltar errores ortográficos"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Icono en el área de notificación"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 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:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Mensaje entrante:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "ID de _Jabber: "
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "E_ntrar a un nuevo salón..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "Histórico de conversaciones"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "_Registrar cambios de estado de los contactos"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Miembro"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "_Combinar las cuentas"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "_Modificar cuenta..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Nombre: "
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "_Notificarme"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificarme cuando una transferencia finalice"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "_Acciones"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "Usuarios _online"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Abrir el compositor de correo"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Abrir..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Mensaje saliente:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "_Propietario"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "C_ontraseña:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Reproductor:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Emerger"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Presencia"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Publicar"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "_Eliminar del Roster"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "Renombrar"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Restablecer colores por defecto"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Recuperar"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "C_ontraseña:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Buscar"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "_Enviar"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "_Enviar y Cerrar"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "_Enviar mensaje privado"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "_Enviar mensaje de servidor"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "_Enviar mensaje"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Ordenar contactos por estado"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Estado"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Mensaje de estado:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Añadir"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Subscripción"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+msgid "_URL:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Usar proxy"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "_Nombre"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Voz"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "Consola _XML..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "lista de transferencias"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "minutos"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Error: no se puede abrir %s para lectura"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Error leyendo el archivo:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Error analizando el archivo:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "No se puede escribir en %s. El soporte de manejo de sesión no funcionará"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Buscar"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Eliminar MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Buscar"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "creando base de datos de registros"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3642,36 +3727,36 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Migrando el registro..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Fecha"
@@ -3705,142 +3790,157 @@ msgstr "El estado es ahora: %(status)s: %(status_msg)s "
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Mensaje"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Iniciar conversación con la cuenta %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Ya estás en el salón %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "No puedes entrar a un salón de chat estando invisible"
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "_Entrar en un nuevo salón"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Gestionar marcadores..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "a la cuenta %s"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "usando la cuenta %s"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "usando la cuenta %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Gestionar marcadores..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "para la cuenta %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_Histórico"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "_Entrar en un nuevo salón"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 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 este transporte"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 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:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "Re_nombrar"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "_Conectar"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "La autorización ha sido enviada"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, 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:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "La autorización ha sido eliminada"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verá desconectado."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Eliminando este contacto también se está eliminando la autorización. Este "
+"contacto siempre te verá desconectado."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3848,37 +3948,37 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 msgid "I want this contact to know my status after removal"
 msgstr "Quiero que este contacto conozca mi estado después de la eliminación"
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Contraseña requerida"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Introduce contraseña GPG para la cuenta %s"
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Guardar contraseña"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Contraseña"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Estás participando en uno o más grupos de charla"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3886,19 +3986,19 @@ msgstr ""
 "Cambiando tu estado a invisible provocará tu desconexión de los grupos de "
 "charla. ¿Estás seguro de querer ser invisible?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 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:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3906,151 +4006,139 @@ msgstr ""
 "Los mensajes sólo estarán disponibles para lectura posterior si tienes el "
 "histórico activado"
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "De %s en el salón %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Enviar archivo a un contacto"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Cambiar mensaje de estado..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Cambiar mensaje de estado..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Oculta este menú"
 
-#: ../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"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %s mensaje sin leer"
 msgstr[1] "Gajim - %s mensajes sin leer"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - %d mensaje único sin leer"
 msgstr[1] "Gajim - %d mensajes únicos sin leer"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - %s mensajes sin leer"
 msgstr[1] "Gajim - %s mensajes sin leer"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - %s mensaje privado sin leer"
 msgstr[1] "Gajim - %s mensajes privados sin leer"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Rol: "
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Afiliación: "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Estado: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Estado: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Subscripción: "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "_Iconos de estado por defecto:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Tamaño: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Tipo: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Tamaño: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Tipo: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "No iniciado"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Detenido"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Pausado"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Este servicio no ha respondido todavía con información detallada"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4058,33 +4146,33 @@ msgstr ""
 "Este servicio podría no responder con información detallada.\n"
 "Posiblemente es antiguo o está roto"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Elegir avatar"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Imágenes"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Navegando %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4092,7 +4180,7 @@ msgstr ""
 "Este contacto está interesado en la información de tu presencia, pero tú no "
 "lo estás en la suya"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4100,14 +4188,14 @@ msgstr ""
 "Estás interesado en la información de la presencia del contacto, pero él/"
 "ella no lo está en la tuya"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Tanto tú como el contacto estáis interesados en la información de la "
 "presencia del otro"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4115,24 +4203,24 @@ msgstr ""
 "No estás interesado en la presencia del contacto y el/ella tampoco lo está "
 "en el tuyuo"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Estás esperando la respuesta del contacto acerca de tu petición de adición"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr "Sin una conexión no puedes publicar tu información de contacto."
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "Sin una conexión, no puedes obtener tu información de contacto."
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 #, fuzzy
 msgid "Personal details"
 msgstr "Información personal"
@@ -4177,45 +4265,47 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus no está presente en esta máquina o falta el módulo python"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "El bus de la sesión no está disponible"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Usar DBus o el demonio notificador para mostrar notificaciones"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tiempo en minutos, después de haber cambiado a ausente"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Ausente por inactividad"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tiempo en minutos, después de haber cambiado a no disponible"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "No disponible por inactividad"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Si es True, no elimiina */_ . Entonces *abc* será negrita, pero sin eliminar "
 "* *"
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "¿Añadir * y [n] en el título del roster?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4223,12 +4313,12 @@ msgstr ""
 "Cuántas líneas recordar de la última conversación cuando se vuelve a abrir "
 "una pestaña/ventana de conversación"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Cuántos minutos debe durar la última línea de la conversación anterior."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4236,20 +4326,20 @@ msgstr ""
 "Envía un mensaje con Ctrl+Intro y con Intro hace un nuevo renglón (Al estilo "
 "del cliente Mirabilis ICQ)"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Cuántas líneas almacenar para Ctrl+Arriba."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Usar vista compacta cuando abras una ventana de conversación"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Usar vista compacta cuando abras una ventana de salón de charla"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4258,30 +4348,30 @@ msgstr ""
 "URL personalizada con %s donde %s es la palabra/frase o 'WIKTIONARY' que "
 "significa usar wiktionary"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Si está marcado, Gajim puede ser controlado remotamente usando gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4289,23 +4379,23 @@ msgstr ""
 "Se elimina el host que enviamos para la transferencia de un archivo en caso "
 "de traducción de la dirección o redirección de puertos."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Según el estándar IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "¿Mostrar pestaña cuando sólo hay una conversación?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "¿Mostrar borde de la pestaña cuando sólo hay una conversación?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "¿Mostrar botón de cerrar en la pestaña?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4313,7 +4403,7 @@ msgstr ""
 "Una lista de palabras separadas por ';' que serán resaltadas en las "
 "conversaciones de varios usuarios."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4322,11 +4412,11 @@ msgstr ""
 "pulsado. Esta preferencia sólo se activa si se usa el icono del área de "
 "notificación. "
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Si es True, Gajim registra xmpp:// en cada inicio."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4334,7 +4424,7 @@ msgstr ""
 "Si es True, Gajim mostrará un icono en cada pestaña que contenga mensajes "
 "sin leer. Dependiendo del tema, este icono puede ser animado."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4342,7 +4432,7 @@ msgstr ""
 "Si es True, Gajim mostrará el mensaje de estado, si no está vacío, para cada "
 "contacto bajo su nombre en la lista de contactos."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4351,7 +4441,7 @@ msgstr ""
 "última vez o se tiene guardado uno demasiado antiguo."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4359,20 +4449,20 @@ msgstr ""
 "Si es False, no verás más la línea de estado en las conversaciones cuando un "
 "contacto cambia su estado y/o su mensaje de estado."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4383,14 +4473,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Durmiendo"
@@ -4459,184 +4560,99 @@ msgstr ""
 "Sonido a reproducir cuando se recibe cualquier mensaje MUC. (Esta "
 "preferencia sólo se activa si notify_on_all_muc_messages es False)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr ""
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr ""
-
-#: ../src/common/connection.py:68
-#, fuzzy
-msgid "Unable to load idle module"
-msgstr "No se pudo entrar al salón"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "No se pudo entrar al salón"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "Se requiere una contraseña para entrar a este salón"
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Estás expulsado de este salón"
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "No existe el salón."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "La creación de salones está restringida."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Es necesario usar el alias registrado."
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "No estás en la lista de miembros"
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Tu alias deseado está en uso o registrado por otro ocupante. \n"
-"Por favor, especifica otro alias abajo:"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-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:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "estamos ahora suscritos a %s"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "petición de eliminación de suscripción de %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "ya no estamos suscritos a %s"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, 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:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 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:1464
-#, fuzzy, 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 ""
-"El Jid %s no cumple la norma RFC. No será añadido a tu roster. Usa "
-"herramientas de gestión del roster como http://jru.jabberstudio.org/ para "
-"eliminarlo"
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Contraseña no válida"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Contraseña no válida"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "No se puede conectar a \"%s\""
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Conectado al servidor %s:%s con %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Comprueba tu conexión o inténtalo más tarde"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falló la autentificación con \"%s\""
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 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:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "No se ha facilitado la clave OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Te conectarás a %s sin OpenPGP"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "invisible"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "desconectado"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Estoy %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Este mensaje está encriptado]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4645,207 +4661,206 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "La información de registro para el transporte %s no llegó a tiempo"
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
+msgstr "Me gustaría añadirte a mi lista de contactos"
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Caracter no válido en el nombre de usuario."
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Se requiere la dirección del servidor."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Carácter no válido en el nombre del host."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Carácter no válido en el recurso."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr ""
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr ""
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr ""
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr ""
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr ""
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr ""
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr ""
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "No disponible"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "_Libre para hablar"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Libre para hablar"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "En líne_a"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "En línea"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Ausente"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "Desconocido"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "Tiene errores"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "Salón:"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "_Añadir"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "está prestando atención a la conversación"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "está haciendo algo más"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "está escribiendo..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "ha parado de escribir"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "ha cerrado la ventana de chat"
 
@@ -4855,10 +4870,109 @@ msgstr "ha cerrado la ventana de chat"
 msgid "error: cannot open %s for reading"
 msgstr "error: no se puede abrir %s para lectura"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr ""
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr ""
 
+#~ msgid "Send"
+#~ msgstr "Enviar"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr ""
+#~ "%(nickname)s en el salón %(room_name)s te ha enviado un nuevo mensaje"
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s te ha enviado un nuevo mensaje"
+
+#, fuzzy
+#~ msgid "GUI Migration failed"
+#~ msgstr "falló la publicación de la vCard"
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "El registro ha sido migrado satisfactoriamente a la base de datos"
+
+#~ 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"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Perfil, Avatar"
+
+#~ msgid "_Online Users"
+#~ msgstr "Usuarios _online"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Iniciar conversación con la cuenta %s"
+
+#~ msgid "All contacts in this group are offline or have errors"
+#~ msgstr ""
+#~ "Todos los contactos de este grupo están desconectados o tienen errores"
+
+#~ msgid "Size: "
+#~ msgstr "Tamaño: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "El bus de la sesión no está disponible"
+
+#, fuzzy
+#~ msgid "Unable to load idle module"
+#~ msgstr "No se pudo entrar al salón"
+
+#~ msgid "Unable to join room"
+#~ msgstr "No se pudo entrar al salón"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Se requiere una contraseña para entrar a este salón"
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Estás expulsado de este salón"
+
+#~ msgid "Such room does not exist."
+#~ msgstr "No existe el salón."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "La creación de salones está restringida."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Es necesario usar el alias registrado."
+
+#~ msgid "You are not in the members list."
+#~ msgstr "No estás en la lista de miembros"
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "Tu alias deseado está en uso o registrado por otro ocupante. \n"
+#~ "Por favor, especifica otro alias abajo:"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "estamos ahora suscritos a %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "petición de eliminación de suscripción de %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "ya no estamos suscritos a %s"
+
+#, fuzzy
+#~ 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 ""
+#~ "El Jid %s no cumple la norma RFC. No será añadido a tu roster. Usa "
+#~ "herramientas de gestión del roster como http://jru.jabberstudio.org/ para "
+#~ "eliminarlo"
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr "La información de registro para el transporte %s no llegó a tiempo"
+
 #~ msgid "Sound"
 #~ msgstr "Sonido"
 
@@ -4991,9 +5105,6 @@ msgstr ""
 #~ msgid "with account "
 #~ msgstr "cuenta: "
 
-#~ msgid "New Message as %s"
-#~ msgstr "Nuevo mensaje como %s "
-
 #~ msgid "Chat with"
 #~ msgstr "Charlar con"
 
diff --git a/po/eu/LC_MESSAGES/gajim.po b/po/eu/LC_MESSAGES/gajim.po
index bdb78de9e..917fd7254 100644
--- a/po/eu/LC_MESSAGES/gajim.po
+++ b/po/eu/LC_MESSAGES/gajim.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the gajim package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2005.
 #
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2006-02-21 19:01+0100\n"
 "Last-Translator: Urtzi Alfaro <urtzi@altza.net>\n"
 "Language-Team: Basque <urtzi@altza.net>\n"
@@ -53,7 +53,7 @@ msgid "Hidden"
 msgstr "Ikusezin"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -70,62 +70,59 @@ msgstr ""
 "Highlighting misspelled words feature will not be used"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "Konexioa ez dago erabilgarri"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 msgid "Your message can not be sent until you are connected."
 msgstr "Zure mezua ezin da bidali konektatu harte"
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Txat"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Txat"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "Ireki OpenPGP Enkriptazioa"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s-ak ez du trasmititu OpenPGP kode bat ez behintzat ezarritakorik"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Enkriptazioa aktibatuta"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "Zerrendan ez dago"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -133,20 +130,20 @@ msgstr ""
 "Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko "
 "duzu."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "%s _minuturo"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Aktibatua"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -194,152 +191,165 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP ezin da ordenagailu honetan erabili"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Zerbitzarira konektatu zaude dagoeneko"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Kontu izena ezin da hustu."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Kontuko izenak ezin du espaziorik izan."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID baliogabea"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "\"izena@zerbitzaria\" Jabber ID-a horrela izan behar da."
 
-#: ../src/config.py:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Horrelako konturik ez erabilgarri"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 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:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Konektatzen ez bazara, ezin duzu zure informazio pertsonala aldatu."
 
-#: ../src/config.py:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Kode sekretua lortzeko huts egitea"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Ireki OpenPGP Enkriptazioa"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Aukeratu zure OpenPGP kodea"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Ez da koderik aukeratu"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Izena"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "Editatu %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "%s -ra erregistratua"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr "Debekatutako Zerrenda"
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 msgid "Member List"
 msgstr "Partaide Zerrenda"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 msgid "Owner List"
 msgstr "Jabe Zerrenda"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 msgid "Administrator List"
 msgstr "Administratzaile Zerrenda"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr "Arrazoia"
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 msgid "Role"
 msgstr "Eginkizuna"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 msgid "Banning..."
 msgstr "Debekatzen..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -347,11 +357,11 @@ msgstr ""
 "<b>Zein nahi duzu debekatu?</b>\n"
 "\n"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr "Kidea ezartzen..."
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -359,11 +369,11 @@ msgstr ""
 "<b>Zein nahi duzu kide egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr "Jabea ezartzen..."
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -371,11 +381,11 @@ msgstr ""
 "<b>Zein nahi duzu jabe egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 msgid "Adding Administrator..."
 msgstr "Administratzailea ezartzen..."
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -383,7 +393,7 @@ msgstr ""
 "<b>Zein nahi duzu administratzaile egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -399,95 +409,105 @@ msgstr ""
 "4. zerbitzaria (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "\"%s\"  kontua zerbitzarira konektatu da"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "\"%s\"  kontua zerbitzarira konektatu da"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Gela Berria"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Talde agenda honek datu-banku baliogabea du"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 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:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Pasahitz baliogabea"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 msgid "You must enter a password for the new account."
 msgstr "Kontu berrirako pasahitz bat sartu behar duzu."
 
-#: ../src/config.py:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "Bi lekuetan pasahitza berdina izan behar du."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Jabber ID baliogabea"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Kontaktu hau zure zerrendan dago ezarria jadanik."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
 
@@ -544,112 +564,111 @@ msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings are missing in this computer"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim-en D-Bus gaitasun funtzioa ezin da erabili"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Kontaktuaren izena: <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Transportea"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Taldea"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "Taldean"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "ID kodea"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Kontaturen izena"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Egoera Mezua"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Egoera Mezua"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Egoera Mezu Ezarriak</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Sar ezazu zure egoera mezu berria:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Mesedez bete sartu nahi duzun kontaktuaren informazioa %s kontuan sartzeko"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Transportea"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "Bezero ID Baliogabea"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Zerbitzari honek ez du begiratzeko menurik."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Kontaktu hau zure zerrendan dago ezarria jadanik."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber bezeroa"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr "ESKERRAK:"
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 #, fuzzy
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
@@ -657,51 +676,51 @@ msgstr ""
 "eskerrak ematen diegu paketeak mantentzen dituztenei"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr "Urtzi Alfaro <urtzi@altza.net>"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Harpidetza baimena %s kontutik %s kontura"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Harpidetza baimena %s kontutik"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 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:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Txat Taldera Sartu %s kontuarekin"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Txat Taldean Sartu"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 msgid "Invalid room or server name"
 msgstr "Baliogabeko gela edo zerbitzari izena"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr "Gela izenak edo zerbitzariak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Elkarrizketa Hasi %s kontuarekin"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Elkarrizketa Hasi"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -710,157 +729,164 @@ msgstr ""
 "kontaktu ID-a ezarri:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatua zauden."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Pasahitza sartu behar duzu."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Kontaktua konektatuta"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Mezu Berria Bat"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Mezu Berri Bat"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Mezu Pribatu Berri Bat"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Fitxeroa Transferitzeko Baimena"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Fitxero Transferitze Errorea"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Fitxero Transferitzea Egina"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Fitxero Transferentzia Gelditua"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 msgid "New E-mail"
 msgstr "E-Mai Berria"
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Fitxeroa Transferitzeko Baimena"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Fitxero Transferitze Errorea"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Fitxero Transferitzea Egina"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Fitxero Transferentzia Gelditua"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "Inor ez"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Mezu Bakarra %s Kontuarekin"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Mezu Bakarra"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Bidali %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsola %s-rena"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr " XML Konsola"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "Gonbidatu  %(contact_jid)s %(room_jid)s. gelara."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Aukeratu Soinua"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Wav Soinuak"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Besteak"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Konferentzia"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Konektatu gabe ezin duzu zerbitzari erabilgarriak bilatu"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Zerbitzaria Aurkitua %s kontua erabiliz"
@@ -869,11 +895,11 @@ msgstr "Zerbitzaria Aurkitua %s kontua erabiliz"
 msgid "Service Discovery"
 msgstr "Zerbitzua Aurkitua"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Zerbitzua ezin izan da aurkitu"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -881,174 +907,175 @@ msgstr ""
 "Ez dago zerbitzurik zuk sartu duzun helbidean edo ez du erantzuten. Begiratu "
 "helbidea eta saiatu berriro."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Zerbitzua erabilezina"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du menurik begiratzeko."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "%s kontua erabiliz"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Bilatu"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du begiratzeko menurik."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "Erre_gistratu"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Sartu"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Eskaneatzen  %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Erabiltzaileak"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Deskribapena"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Fitxeroa"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Denbora"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Prozesua"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Fitxeroaren izena: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaina: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Zu"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Bidaltzaile: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Hartzailea: "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "%s gordea"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Fitxero transferentzia osatua"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Ireki Fitxeroaren Edukia"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Fitxero transferentzia ezeztatua"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Fitxero transferentzia gelditua beste kontaktuarengatik"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Aukeratu Bidaltzeko Fitxeroa..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Bidali"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "_Bidali"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim-ek ezin du fitxero honetan sartu."
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Beste prozesu batek erabiltzen du orain fitxero hau."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Fitxero hau jadanik badago"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 msgid "What do you want to do?"
 msgstr "Zer nahi duzu egitea?"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Fitxeroa: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Deskribapena: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s fitxero bat bidali nahi dizu:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Gorde Bezala..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Nahi al duzu berridatzi?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1056,7 +1083,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
@@ -1073,12 +1100,12 @@ msgstr "Fitxeroa:"
 msgid "It is not possible to send empty files"
 msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Izena: "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Bidaltzailea: "
 
@@ -1086,32 +1113,32 @@ msgstr "Bidaltzailea: "
 msgid "Pause"
 msgstr "Etena"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Jarraitu"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Popup leihoa hurrengo mezu irakurri gabearekin"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1119,43 +1146,43 @@ msgstr ""
 "Zerrendan inprimatu kontaktu guztien lista. Kontaktu horiek hainbat lerrotan "
 "agertuko dira."
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "kontua"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "Ikusi emandako kontaktuak bakarrik"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Inprimatu erregistratutako kontuen lista"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "egoera"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "hauetako bat: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "mezua"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "egoera mezua"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1164,19 +1191,19 @@ msgstr ""
 "\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
 "egoera aldatzen"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Txat leihoa erakutsi, honela, kontaktuari mezua bidali diezaiokezu"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "Txateatu nahi duzun pertsonaren JID-a"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "hautatua badago, kontaktua kontu honen kontaktu listatik lortuko da."
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1186,125 +1213,125 @@ msgstr ""
 "kontua dira aukerazkoak.´Kontua´ bakarrik zehaztu nahi baduzu, ´OpenPGP "
 "koderik´ gabe, bakarrik ´OpenPGP kodea´ -entzat zehaztu."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "mezuaren edukia"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "pgp giltza"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "hautatua badago, kode publikoa erabiliz enkriptatuko da mezua"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "hautatua badago, mezua kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "Kontaktuaren JID-a"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Ez duzu aktibatutako konturik"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Fitxero bat bidali kontaktu bati"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "fitxeroa"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Fitxeroaren tokia"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "Hautatua badago, fitxero hau kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Erakutsi preferentzia eta balio guztiak"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Preferentziako aukera borratu"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "giltza"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "preferentziaren izena borratzeko"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim-en berezko preferentzien egoera .config fitxategian idatzi"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Zerendara kontaktua sartu"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Kontu honetara kontaktu berri bat sartu."
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Oraingo egoera itzuli (Globala, ez badago kontu bat aukeratuta)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Oraingo egoera mezua itzuli(Globala aukeratu ez badago kontu bat aukeratuta)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Galdutako argumentua  \"contact_jid\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1313,16 +1340,16 @@ msgstr ""
 "'%s'  ez dago zure zerrendan.\n"
 "Kontua zehaztu mezua bidaltzeko"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Ez duzu aktibatutako konturik"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1331,16 +1358,16 @@ msgstr ""
 "Usage: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Argumentuak:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s ez da aurkitu"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1349,7 +1376,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1358,31 +1385,31 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim-ek Xserver behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ rutinak ez du libglade sostengatzen"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1390,133 +1417,152 @@ msgid ""
 msgstr ""
 "GTK+ rutina borratu eta instalatu ezazu azken bertsio establea %s hemendik"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Konproba ezazu GTK+ eta  PyGTK  libglade onartzen dutea zure sistemak."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim-ek PySQLite2 behar du abiarazteko"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: ../src/gajim.py:498
-#, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "%(room_name)s-eko %(nickname)s -ek mezu berri bat bidali dizu."
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Kontaktua konektatuta"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s mezu berri bat bidali dizu."
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Kontaktua deskonektatuta"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Mezu Pribatu Berri Bat"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Mezu Berri Bat"
+
+#: ../src/gajim.py:610
+#, fuzzy, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Mezu Berria %s bezala"
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "errore bat sortu da bidaltzen zen bitartean"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Autorizazioa baimendua"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "\"%s\" kontaktuak baimendu dizu bere egoera ikusteko."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" kontaktuak harpidetza borratu dizu"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Beti deskonektatua ikusiko duzu."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" ezin izan da kontaktuan jarri"
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s orain %s da:(%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Zure pasa-esaldia ez da egokia"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Zure OpenPGP koderik gabe konektatu zara."
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, fuzzy, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr "%(new_mail_gajim_ui_msg)s  %(gmail_mail_address)s-en"
+
+#: ../src/gajim.py:1045
 #, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] "E-mail berri %d duzu"
 msgstr[1] "%d E-mail berri dituzu"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr "%(new_mail_gajim_ui_msg)s  %(gmail_mail_address)s-en"
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Ondo jasoa izan da  %(name)s-ren %(filename)s  fitxeroa."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 "%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Jadanik bidalia izan da %(filename)s   %(name)s -ri."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "vCard argitarapena egina"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Zure informazio pertsonala egoki argitaratua izan da."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "vCard argitarapenak hust egin du"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1526,161 +1572,143 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta preferentziak  gorde"
 
-#: ../src/gajim.py:1719
-msgid "GUI Migration failed"
-msgstr "GUI Migrazioak Huts egin du"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-"Log eraldaketak huts egin du du interfaz grafikoaren bidez. Eraldaketa "
-"prozesua beste prozesuen azpian hasiko da. Mesedez itxoin minutu batzuk "
-"Gajim abiarazteko."
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "Log-ak egoki eraldatu dira datu basera."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management support not available (missing gnome.ui module)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Log-ak Eraldatzen..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Mesedez itxoin log-a eraldatzen den bitartean...."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Gaia"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "gaiaren izena"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Ezin duzu zure berezko gaia ezabatu"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Txat pribatua"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Txat pribatua"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, 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/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Txat Taldea"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Txat Taldea"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Gela honek ez du gairik"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s debekatu da %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s orain %s bezala ezaguna da"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s deskonektatu da"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s orain %s da"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nick-a aurkitugabea: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Gonbidatu  %(contact_jid)s %(room_jid)s. gelara."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ez du ematen baliozko JID bat denik"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "No such command: /%s (if you want to send this, prefix it with /say)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1693,7 +1721,7 @@ msgstr ""
 "\" -rik  badu. JID-a jadanik gelan bada, bera botatata izango da. Nick-ak EZ "
 "du onartzen tarterik. "
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1701,24 +1729,24 @@ msgstr ""
 "Erabilera: /%s <nickname>,, ireki txat pribatu bat espezifikatutako "
 "erabiltzaileari."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Erabilera: %s, testu leihoa itxi."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr "Erabilera: /%s [reason],  itxi leihoa, zergatia erakutsiz behar bada."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Erabilera: /%s, talde txat-eko leihoa compact moduan jarri."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1727,7 +1755,7 @@ msgstr ""
 "Erabilera: /%s <JID> [reason], gonbidatu JID-a oraingo gelara, aukerazko "
 "arrazoi bat emanez. "
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1736,7 +1764,7 @@ msgstr ""
 "Erabilera:  /%s <room>@<server>[/nickname], eskaini room@server-era sartzen "
 "aukeraz nick bat ezarriz."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1747,7 +1775,7 @@ msgstr ""
 "erabiltzailea gelatik eta nahi bada arrazoi bat adierazi. EZ da onartzen "
 "espazioak nick-an."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1756,7 +1784,7 @@ msgstr ""
 "Erabilera:  /%s <action>, bidali aukeratutako ekintza daukazun oraingo "
 "gelara. Erabili 3. pertsona. (e.g. /%s explodes.)"
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1765,89 +1793,89 @@ msgstr ""
 "Erabilera: /%s <nickname> [message], ireki mezu pribatuko leiho bat eta "
 "bidali zehaztutako nick-aren erabiltzailera."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Erabilera:  /%s <nickname>, aldatu zure nick-a oraingo gelan."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Erabilera: /%s [topic], erakuts arazi edo aktualizatu oraingo gelako gaia."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Erabilera:  /%s <message>, mezu bat bidali beste komandoak bilatu gabe."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ez dago laguntza informazioa  /%s -rentzat"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Leiho hau isten baduzu, gela honetatik deskonektatuko zara."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "E_z galdetu berriro  \"%s\" isteaz "
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Gaia Aldatuz"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Gai berria zehaztu:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Nick-a Aldatu"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Mesedez zehaztu ezazu zuk erabili nahi duzun nick berria:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Talde agenda ezarria"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "\"%s\" gela zure talde agendan dago."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Talde agenda egoki sortu da"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Zure talde agenda moldatu dezakezu zure zerrendako aukera menuaren bidez."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Botatzen %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Arrazoia zehaztu behar duzu behean:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Debekatzen %s"
@@ -1895,111 +1923,120 @@ msgstr "<b>Konfigurazio Aurreratuaren Editorea</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Aplikazioak</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Bezeroak</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Deskribapena</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Lerroaren Formatua</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Grafikoen Kontrola</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Trafikoa</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Denetatik</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informazio Pertsonala</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Mesedez aukeratu hemen beheko aukeretako bat:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Mesedez bete zure kontu berrirako informazioa</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Mesedez aukeratu hemen beheko aukeretako bat:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Egoera Mezu Ezarriak</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Propietateak</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Aldaketak</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Soinuak</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Sar ezazu zure egoera mezu berria:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Ikusizko Jakinarazketa</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Zer nahi duzu egin?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Sarrera</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "K_ontua"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Nick-aren ondoren:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "About"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Onartu"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Kontua"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2007,52 +2044,44 @@ msgid ""
 "Banner"
 msgstr "Kontua/nTaldea/nKontaktua/nBanner"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Kontu Eraldaketa"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Kontuak"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "Aukera Aurre_ratuak"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Kontaktu Berri bat Sartu"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Ikusizko Jakinarazketa</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Kontaktua _Sartu"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Helbidea"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Konfigurazio Aurreratuaren Editorea"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Nick-aren ondoren:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Orduaren ondoren:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2062,56 +2091,56 @@ msgstr ""
 "Konposatzen bakarrik\n"
 "Desaktibatuta"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Baimena _OS informazioa bidaltzeko"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Baimendu nire egoera ikustea"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Baiemendu popup/jakinarazteak Kanpoan/Ez erabilgarri/Ikusezin nagoenean"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "iChat estiloa bezala ere ezagutua"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Eskatu egoera mezua, nagoenean:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Bere egoera ikusteko esan"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Eskatu:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Open_PGP kodea zehaztu"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Kontaktu autorizatua beraz, zure egoera ikus dezake"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Automatikoki _kanpoan ondoren:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Automatikoki _ez erabilgarri ondoren:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Automatikoki sartu"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2123,15 +2152,15 @@ msgstr ""
 "Bet KDE-ren berezko aplikazioak erabili\n"
 "Bezeroa"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Automatikoki baimendutako kontaktua"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Konektatu berriro konexioa galtzean"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2144,13 +2173,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Nick-a baino lehen:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Ordua baino lehen:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Nick-a baino lehen:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2266,132 +2292,136 @@ msgid "Company:"
 msgstr "Konpainia:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Gela Konfigu_ratu"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Konektatu bukatu sakatzen dudanean."
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Konektatu"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "Kontaktuaren _ Informazioa"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "Elkarrizketaren Historiala"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "Estatua:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "Berezko _egoera ikurrak:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Borratu MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Eguneko Mezua Borratu"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Eguneko Mezuak Borratu"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Ukatu"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr "Autorizazioa ezeztatu, honela kontaktuak ezin du zure egoera ikusi"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Departamentua:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Kontaktuen abatereak ikusi zerrendan"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Erakuts arazi kontaktuen egoera mezua zerrendan"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "5 _minuturo"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Taldeak Editatu"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Informazio Pertsonala Editatu..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Editatu _Taldeak"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Emoticonoak ezarri:"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Aktibatu"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Sartu berriro baieztatzeko:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Sartu pasahitz berria:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Gertaerak"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "5 _minuturo"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Helbide Gehigarria:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Familia:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Fitxero Transferentzia"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "Fitxero _Transferentzia"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Fitxero administratzaile:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Filtroa:"
@@ -2401,39 +2431,35 @@ msgid "Font style:"
 msgstr "Iturburuaren estiloa:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Mota:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Debekatu nire egoera ikustea"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Formatua: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Frequently Asked Questions (online)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "Norena:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "J_oan"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Gajim-en Gaien Kustomizatazailea"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2443,7 +2469,7 @@ msgstr ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2451,7 +2477,7 @@ msgstr ""
 "Gajim-ek automatikoki jasotako mezu berriak leiho berri batean edo jadanik "
 "dagoen leiho batean erakutsiko ditu"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2460,13 +2486,13 @@ msgstr ""
 "Gajim-ek mezu berriaz jakinaraziko dizu popup bidez pantailaren beheko "
 "eskubiko aldean"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 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 jakinaraziko dizu Gajim-ek popup bidez"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2474,26 +2500,34 @@ msgstr ""
 "Deskonektatu diren kontaktuez Gajim-ek jakinaraziko dizu popup bidez "
 "pantailako beheko eskubiko aldean"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajim-ek bakarrik kontaktuaren ikonoa mezu berri bat dagoenean aldatzen du"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontu Sortzailearen Wizard-a"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Orokorra"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Eman izena:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Inor ez"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Taldea:"
@@ -2541,18 +2575,24 @@ msgid "I would like to add you to my contact list."
 msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 
 #: ../src/gtkgui.glade.h:170
-msgid "If checked, Gajim will also have a trayicon"
-msgstr "If checked, Gajim will also have a trayicon"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
+msgstr ""
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 "Hautatua badago, Gajim-ek zerrendan kontaktuen abatereak azalaraziko ditu"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen "
 "azpian"
@@ -2635,8 +2675,9 @@ msgstr ""
 "kontaktu guztiak kontu bat izango bazenu bezala jarriko lituzke zerrendan"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Sarrerako mezua:"
+#, fuzzy
+msgid "Inactive"
+msgstr "Aktibatua"
 
 #. 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:185
@@ -2672,39 +2713,57 @@ msgid "Location"
 msgstr "Kokapena"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Mezua"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Moldatu..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Kontuak moldatu"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Talde Agenda Moldatu"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Proxy Profila Moldatu"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Moldatu..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Izen erdia:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "Mo_deratzailea"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Gehiago"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Izena:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2716,108 +2775,104 @@ msgstr ""
 "Kontuko\n"
 "Gaiaz"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Nick-a:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Inor ez"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Jakinarazi kontaktuek hau egitean: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr "Gmail-eko E-mail berri batez jakinarazi"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "Mezu _guztietan"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 msgid "One message _window:"
 msgstr "M_ezu leiho bat"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Ireki..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Kanpoan nagoeneko mezua:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "Pasa_hitza:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Pasa-esaldia"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Etena"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Informazio Pertsonala "
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Telefono Zenbakia:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Soinuak _entzun"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Portua: "
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Tokia:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Posta Kodea:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Preferentziak"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Izeneko aurreizkia:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "egoera mezua"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Imprimatu ordua:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Lehentas_una:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2827,61 +2882,53 @@ msgstr ""
 "berdinarekin, zeinek jaso behar duen informazioa determinatzen du; "
 "Lehentasun handiena duen bezeroak jasotzen ditu mezuak"
 
-#: ../src/gtkgui.glade.h:237
-msgid "Profile, Avatar"
-msgstr "Profila, Abatareak"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Protokoloa:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Query Builder..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Berriki:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Erregistratu honetara"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Ezabatu k_ontua Gajim-etik bakarrik"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Ezabatu kontua Gajim-etik eta baita _zerbitzaritik"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Listatik fitxero tranferentzia ezabatu."
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr ""
 "Ezabatu  kantzelatuak, osorik eta huts egin dutenak  fitxero transferentzia "
 "zerrendatik"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Erantzun mezu honi"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Berezko Koloreak Ezarri"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "Baliabid_ea: "
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2895,168 +2942,160 @@ msgstr ""
 "kontu berdera `etxea` baliadidearekin jarria baduzu, mezua lehentasun "
 "handiaena duenera bidaliko da. (Behean ikusi) "
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Baliabidea:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Eginkizuna:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Gelaren Konfigurazioa"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Gela:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Gorde _pasa-esaldia(ez trinkoa)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr "Gorde _posizioa eta tamaina zerrendarena eta txateko leihoarena"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Gorde Bezala..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "_Gorde kontu guztien elkarrizketak"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Gorde pasa_hitza"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "_Bidali"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Bidali fitxeroa"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Bidali Mezu _Bakarra"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Bidali _Fitxeroa"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Mezu _Berri bat Bidali ..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Bidali keep-alive paketeak"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Bidali mezua"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Bidali mezua eta itxi leihoa"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 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:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Zerbitzariaren Ezaugarriak:"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Ezarri MOTD"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Ezarri Eguneko Mezua"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Ezarri _Abatereak"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Ezarri abatere bat konektatzean"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Ezarri Eguneko Mezua"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Erakutsi pendiente dauden _gertaerak"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Ikusi _Zerrenda"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "_XML Konsola Ikusarazi"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Ikusi _zerrendan bakarrik"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Shows a list of file transfers between you and other"
 msgstr "Erakutsi zu eta beste baten arteko fitxero transferentzia"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "_Konektatua"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "_Deskonektatua"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Sailkatu kontaktuak egoeraren bidez"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "E_goera"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Elkarrizketa _Hasi"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Egoera:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Egoera"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Egoera mezua:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Egoera:"
@@ -3087,25 +3126,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Egoera globalarekin sinkro_nizatu kontaktuen egoera"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Gaia:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "Testuaren _kolorea:"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "Testu _mota:"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "Automatikoki kanpoko egoera mezua"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "Automatikoki ez erabilgarriko egoera mezua"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Gaia:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3131,50 +3171,56 @@ msgid "Type:"
 msgstr "Mota:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr "URL:"
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Azpimarratu"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "MOTD Gaurkotu"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Eguneko Mezua Gaurkotu"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Eguneko Mezua Gaurkotu"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Erabili _SSL(Legacy)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "Erabili _transporteen ikurrak"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Erabili autentifikazioa"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Erabili bezeroaren hostname/portua"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "fitxeroen transferentziaren lista"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Ikonifikazioa (aka. notification area)"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "Erabiltzailearen ID:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Fitxero transferentzia bukatzean erakutsi popup jakinarazte bat"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3187,21 +3233,21 @@ msgstr ""
 "baten jakinaraztea, bakarrik, dagoeneko hitz egiten ari zaren pertsona "
 "batekin izan ezik izango da."
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Ekintza berri bat jasotzean."
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Lana"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3209,416 +3255,456 @@ msgstr ""
 "Kontu bat behar duzu\n"
 "Jabber sarera konektatzeko"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Zure JID-a:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Aukerak"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "_Kontaktua Gehitu..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "_Zerrendara Sartu"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Helbidea:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Administratzailea"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "A_urreratua"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Orduaren ondoren:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Autorizatu"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "A_tzealdeko kolorea:"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Debekatu"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Ordua baino lehen:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "_Talde Agendan Sartu Gela hau"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Bilatu:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_kantzelatu"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "_Bista trikoa        Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Edukiak"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiatu JID/Email-a"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Lotura kokapena kopiatu"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Ukatu"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Zerbitzuak Aurkitu"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Zerbitzuak Aurkitu..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Fitxero administratzaile:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Filtroa:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Bukatu"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Mota:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "Txat _Taldea"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_Historiala"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_IG"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Ikonifikazioa (aka. notification area)"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Zerrendan ez dauden kontaktuen gertaerak baztertu"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Sarrerako mezua:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "Gela Berrian _Sartu..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "_Bota"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "Elkarrizketaren _historiala"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "Kontaktuen egoera aldaketak gorde"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "_Email bezeroa"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Partaidea"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "_Batu kontuak"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Mezua"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Eraldatu"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "Kontua E_ditatu"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Izena "
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Inoiz"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "_Jakinarazi horri buruz"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Jakinarazi  fitxeroa transferitu denean"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "_Bete Beharreko Aukerak"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "_Konektatutako Jendea"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Ireki E-mail Konposatzailea"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "Web-ean _Ireki Lotura"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Ireki..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Kanpoan nagoeneko mezua:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "_Jabea"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Eten"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Entzun"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Pop it up"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Portua:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Preferentziak"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Egoera"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Argitaratu"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "At_era"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Borratu"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "_Zerrendatik Ezabatua"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "_Berrrizenpetu"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Erantzun"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Berezko Koloreak Ezarri"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Berridatzi"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Pasahitza:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Bilatu"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "_Bidali"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "_Bidali eta Itxi"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "_Bidali Mezu Pribatu bat"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "_Bidali Zerbitzarira Mezua"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "_Bidali Mezu Bakarra"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Zerbitzaria"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Sailkatu kontaktuak egoeraren bidez"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "Elkarrizketa  _Hasi"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Egoera"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Egoera mezua:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Harpidetza"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Proxy erabili"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "_Izena"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Ahotsa"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "_XML Konsola..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "fitxeroen transferentziaren lista"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "minutu"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Errorea fitxeroa analizatzean:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 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."
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Bilatu"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Borratu MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Bilatu"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "logs-en datu basea sortzen"
 
 #: ../src/history_manager.py:162
 #, fuzzy
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr "Zure log-ak eraldatu nahi al dituzu?"
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3627,36 +3713,36 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Log-ak Eraldatzen..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Data"
@@ -3690,74 +3776,80 @@ msgstr "Egoera orain da: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Egoera orain da: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Mezua"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Elkarrizketa Hasi %s kontuarekin"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Batu kontuak"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 msgid "Observers"
 msgstr "Begiratzaileak"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "Gela Berrian _Sartu"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Talde Agenda Moldatu..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "%s kontura"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "%s kontua erabiliz"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "%s kontua erabiliz"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Talde Agenda Moldatu..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "%s konturako"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_Historiala"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "Gela Berrian _Sartu"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3765,67 +3857,76 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP kode bat izendatu"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Kode bat aukeratu kontuari ezartzeko"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr "Nire zerrendara nahi nizuke sartu"
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "_Berrizenpetu"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "_Log aktibatua"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "Log_desaktibatua"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, 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:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak "
+"deskonektatua ikusiko zaitu beti."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3833,37 +3934,37 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak "
 "deskonektatua ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 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:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Pasa-esaldia Behar da"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako"
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Gorde pasa-esaldia"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Pasa-esaldia"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3871,170 +3972,158 @@ msgstr ""
 "Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
 "honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 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:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 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:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "%s  %s -eko gelan"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Fitxero bat bidali kontaktu bati"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Egoera Mezua Aldatu..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Egoera Mezua Aldatu..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Ezkutatu menu hau"
 
-#: ../src/systray.py:264
-msgid "All contacts in this group are offline or have errors"
-msgstr "Talde honetako guztiak deskonektatuta daude edo erroreak dituzte"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %d mezu irakurri gabe"
 msgstr[1] "Gajim - %d irakurri gabeko mezuak"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - %d mezu irakurri gabe"
 msgstr[1] "Gajim - %d irakurri gabeko mezuak"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - %d  txat taldeko mezua irakurri gabe"
 msgstr[1] "Gajim - %d txat taldeko mezuak irakurri gabe"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - %d mezu pribatu irakurri gabe"
 msgstr[1] "Gajim - %d mezu pribatu irakurri gabe"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Eginkizun:"
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Afizioak: "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Egoera: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Baliabideak: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Egoera: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Harpidetza: "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "Berezko _egoera ikurrak:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Tamaina: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Mota: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Deskargatu"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Kargatu"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Tamaina: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Mota: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Transferitua:"
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Hasigabea"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Gelditua"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Osatua"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Etena"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Tranferitzen"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Zerbitzu honek ez du oraindik erantzun informazio detailatuz."
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4042,33 +4131,33 @@ msgstr ""
 "Zerbitzu honek ezin izan du erantzun.\n"
 "Seguraski ez du erantzun espero bezala edo ez dabil."
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Aukeratu Abatereak"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Irudiak"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "%s bertsioa"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4076,7 +4165,7 @@ msgstr ""
 "Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude "
 "haren egoera informazioan interesatuta"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4084,36 +4173,36 @@ msgstr ""
 "Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan "
 "interesik"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Zu eta kontaktu bien egoera informazioetan interesatuta zaudete."
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Zu ez zaude haren egoera informazioan interesatuta, bera zugan interesa du"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " errekurtsoa lehentasunarekin "
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr "Konexiorik gabe ezin duzu zure kontaktuaren informazioa ezarri."
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "Konexiorik gabe ezin duzu zure kontaktu informazioa lortu."
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 msgid "Personal details"
 msgstr "Informazio pertsonala"
 
@@ -4158,56 +4247,58 @@ msgstr ""
 "D-bus ez dago ordenagailu honetan edo python moduloak ez daude erabilgarri"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "Bus sesioa ez da eskuragarri"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Erabili DBus eta Notification-Daemon jakinarazketak erakusteko."
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Ordua minutuetan, zure egoera kanpoan aldatu ondoren."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Kanpoan beste zerbaitetan egoteagatik"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Ordua minutuetan, zure egoera ez erabilgarri aldatu ondoren."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Ez erabilgarri beste zerbaitetan egoteagatik"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Sartu * eta [n] zerrendako izenburuan?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr "Zenbat lerro gogoarazteko lehengo elkarrizketatik leihoa irikitzean."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Zenbat minutu izan behar ditu azken lerroak  lehengo elkarrizketaren "
 "azkenetik."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4215,20 +4306,20 @@ msgstr ""
 "Bidali mezua Ctrl+Enter -rekin eta Enter-ekin lerro berria egin. (Mirabilis "
 "ICQ Client default behaviour)."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Erabili modu konpaktua txat leiho bat irikitzean"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Erabili bista konpaktua txat talde leiho bat irikitzean."
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4237,29 +4328,29 @@ msgstr ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Hautatua badago, Gajim gajim-remote erabiliz kontrolatu daiteke."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Galdetu leiho bat itxi baino lehen."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Galdetu leiho bat itxi baino lehen."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Galdetu leiho bat itxi baino lehen."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4267,23 +4358,23 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC estandarrak esaten du KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Erakutsi tab-a bakarrik elkarrizketa bat dagoenean?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Show tab border if one conversation?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Isteko botoila erakutsi tab-ean?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4291,7 +4382,7 @@ msgstr ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4299,11 +4390,11 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Egia bada, Gajim-ek erregistratuko du xmpp:/ abiaraztean."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4311,7 +4402,7 @@ msgstr ""
 "Egia bada, Gajim-ek  ikono bat azalaraziko du leiho horretan irakurri gabeko "
 "mezuak adieraziz. Gaiaren arabera ikonoa animatua izan daiteke."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4319,7 +4410,7 @@ msgstr ""
 "Egia bada, Gajim-ek egoera mezua azalaraziko du, hutsik ez badago, zerrendan "
 "kontaktuaren izenaren azpian azalduko dira."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4328,7 +4419,7 @@ msgstr ""
 "last time or has one cached that is too old."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4336,7 +4427,7 @@ msgstr ""
 "Gezurra bada, ez duzu egoera lerroa ikusiko kontaktu batek bere egoera "
 "aldaketa egiten duenean edota bere egoera mezua."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4346,7 +4437,7 @@ msgstr ""
 "badira, make the window flash (the default behaviour in most Window "
 "Managers) when holding pending events."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
@@ -4354,7 +4445,7 @@ msgstr ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4371,14 +4462,25 @@ msgstr ""
 "`gaiaz´- Mezuko gaiak(txat edo txat taldekoena adibidez) leiho konkretu "
 "batera bidaliko dira. Kontuz, funtziona dezan Gajim berriarazi behar da"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr "Ez badago hautatuta, txat leihoan ez duzu abatererik ikusiko "
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Lotan"
@@ -4447,181 +4549,98 @@ msgstr ""
 "Soinu bat entzun MUC mezu bat jasotzean. (Aukera hau bakarrik kontuan "
 "hartzen da kontuaren notify_on_all_muc_messages True bada)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "berdea"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "gizakia"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "arrantzale"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "plain"
-
-#: ../src/common/connection.py:68
-msgid "Unable to load idle module"
-msgstr "Ez izan da idle modulua kargatu"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Ezin da gela honetara sartu"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "Pasahitza behar da gela onetan sartzeko."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Gela honetan ukatua izan zara."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Honako gela hau ez du esistitzen."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "Gela sortzea mugatua dago."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Erregistratutako nick-a erabilia izan behar da."
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Ez zaude kideen zerrendan."
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Zuk aukeratutako nick-a erregistratuta dago jadanik.\n"
-"Mesedez ezarri beste nick bat."
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-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:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "%s -ra harpidetuak gaude orain"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Harpidetza kentzekoa eskaera %s -tik"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "%s -ren harpidetzatik kenduta gaude"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 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:1464
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s 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"
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Pasahitz baliogabea"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Pasahitz baliogabea"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "%s zerbitzarira konektatu: %s %s -ekin"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Begira ezazu zure konexioa edo saiatu berriro"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" -rekin autentifikazioak huts egin du"
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 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:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP pasa-esaldia ez da eman"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, 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:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "ikusezin"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "deskonektatua"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "%s naiz"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4630,207 +4649,206 @@ msgstr ""
 "Gaia: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, 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:699
+msgid "I would like to add you to my roster."
+msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Baliogabeko karakterea izenean."
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Zerbitzariaren helbidea behar da."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Baliogabeko karakterea hostname -ean."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gib"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "Lan_petua"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Lanpetua"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "Ez E_rabilgarri"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Ez erabilgarri"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "Libre _Hitz Egiteko"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Libre Hitz Egiteko"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "_Libre"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Libre"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Konektatzen"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "_Kanpoan"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Kanpoan"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "_Deskonektatuta"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Deskonektatuta"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "Ikuse_zin"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Ikusezin"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "Ezin da jakin"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "Errorea du"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "Norentzat"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "-etik"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Biak"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Harpidetu"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Moderatzaileak"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Moderatzailea"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Partaideak"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Partaidea"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Bisitariak"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Bisitaria"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "arreta jartzen ari da elkarrizketara"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "beste zerbait egiten ari da"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "mezu bat sortzen ari da..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "mezuaren sorrera gelditua"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "tab edo lehioa itxi egin du"
 
@@ -4840,10 +4858,111 @@ msgstr "tab edo lehioa itxi egin du"
 msgid "error: cannot open %s for reading"
 msgstr "errorea: ezin da %s ireki irakurtzeko"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "plain"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "cyan"
 
+#~ msgid "Send"
+#~ msgstr "Bidali"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr "%(room_name)s-eko %(nickname)s -ek mezu berri bat bidali dizu."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s mezu berri bat bidali dizu."
+
+#~ msgid "GUI Migration failed"
+#~ msgstr "GUI Migrazioak Huts egin du"
+
+#~ msgid ""
+#~ "Logs migration through graphical interface failed. The migration process "
+#~ "will start in the background. Please wait a few minutes for Gajim to "
+#~ "start."
+#~ msgstr ""
+#~ "Log eraldaketak huts egin du du interfaz grafikoaren bidez. Eraldaketa "
+#~ "prozesua beste prozesuen azpian hasiko da. Mesedez itxoin minutu batzuk "
+#~ "Gajim abiarazteko."
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "Log-ak egoki eraldatu dira datu basera."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr "If checked, Gajim will also have a trayicon"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Profila, Abatareak"
+
+#~ msgid "_Online Users"
+#~ msgstr "_Konektatutako Jendea"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Elkarrizketa Hasi %s kontuarekin"
+
+#~ msgid "All contacts in this group are offline or have errors"
+#~ msgstr "Talde honetako guztiak deskonektatuta daude edo erroreak dituzte"
+
+#~ msgid "Size: "
+#~ msgstr "Tamaina: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "Bus sesioa ez da eskuragarri"
+
+#~ msgid "Unable to load idle module"
+#~ msgstr "Ez izan da idle modulua kargatu"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Ezin da gela honetara sartu"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Pasahitza behar da gela onetan sartzeko."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Gela honetan ukatua izan zara."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Honako gela hau ez du esistitzen."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "Gela sortzea mugatua dago."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Erregistratutako nick-a erabilia izan behar da."
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Ez zaude kideen zerrendan."
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "Zuk aukeratutako nick-a erregistratuta dago jadanik.\n"
+#~ "Mesedez ezarri beste nick bat."
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "%s -ra harpidetuak gaude orain"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "Harpidetza kentzekoa eskaera %s -tik"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "%s -ren harpidetzatik kenduta gaude"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s 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"
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr ""
+#~ "Erregistroaren informazioa transporteetarako %s ez da denboran iritsi"
+
 #~ msgid "Sound"
 #~ msgstr "Soinua"
 
@@ -5006,9 +5125,6 @@ msgstr "cyan"
 #~ msgid "with account "
 #~ msgstr "kontuarekin"
 
-#~ msgid "New Message as %s"
-#~ msgstr "Mezu Berria %s bezala"
-
 #~ msgid "Chat with"
 #~ msgstr "Txateatu honekin"
 
diff --git a/po/fr/LC_MESSAGES/gajim.po b/po/fr/LC_MESSAGES/gajim.po
index e1ede6378..0b56aabe5 100644
--- a/po/fr/LC_MESSAGES/gajim.po
+++ b/po/fr/LC_MESSAGES/gajim.po
@@ -7,12 +7,12 @@
 # , 2005.
 # 
 # 
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2005-12-08 10:56+0100\n"
 "Last-Translator: Yann Le Boulanger <asterix@lagaule.org>\n"
 "Language-Team: none\n"
@@ -56,7 +56,7 @@ msgid "Hidden"
 msgstr "Éléments masqués"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -73,63 +73,60 @@ msgstr ""
 "La vérification orthographique ne sera pas utilisée"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 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/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Discussion"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Discussion"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "Encryption OpenPGP"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s n'a pas envoyé de clé OpenPGP et vous ne lui en avez pas assigné une"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Encryption activée"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Encryption désactivée"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "Absent de la liste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vous venez de recevoir un nouveau message de \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -137,20 +134,20 @@ msgstr ""
 "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
 "message sera perdu."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Toutes les %s _minutes"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Actif"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -198,200 +195,213 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 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:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "Pour changer le nom du compte, vous devez être déconnecté."
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Nom de compte invalide"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Le nom du compte ne peut pas être vide."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 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:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Compte non disponible"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 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:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
 
-#: ../src/config.py:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 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."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encryption OpenPGP"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Pas de clé sélectionnée"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Serveur"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 #, fuzzy
 msgid "Member List"
 msgstr "_Membre"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 #, fuzzy
 msgid "Owner List"
 msgstr "P_ossesseur"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrateur"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 #, fuzzy
 msgid "Nick"
 msgstr "_Éjecter"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 #, fuzzy
 msgid "Role"
 msgstr "Fonction :"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 #, fuzzy
 msgid "Banning..."
 msgstr "Bannissement de %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Que voulez vous faire ?</b>"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Que voulez vous faire ?</b>"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Que voulez vous faire ?</b>"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrateur"
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Que voulez vous faire ?</b>"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -401,76 +411,86 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "Le compte \"%s\" est connecté au serveur"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Si vous l'enlevez, la connection sera perdue."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Le compte \"%s\" est connecté au serveur"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Si vous l'enlevez, la connection sera perdue."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Nouveau Salon"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-page contient des données invalides"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 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-page"
 
-#: ../src/config.py:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 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:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 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:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Identifiant Jabber invalide"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Le contact est déjà dans votre liste."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -479,19 +499,19 @@ msgstr ""
 "Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
 "fenêtre principale."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Votre nouveau compte a été créé avec succès"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
@@ -552,165 +572,164 @@ msgstr "Sujet : %s\n"
 
 # Traduction moins mauvaise mais pas terrible: binding=lier, attacher
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "La passerelle python - D-Bus n'est pas installée sur cet ordinateur"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Les possibilités D-Bus de Gajim ne peuvent pas être utilisées"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Nom du contact : <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Passerelles"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Groupe"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "Dans le groupe"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Nom du contact"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "Message d'état %s"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Message d'état"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Messages d'état prédéfinis</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Taper votre nouveau message d'état :"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Remplissez les informations sur le contact à ajouter au compte %s"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Remplissez les informations sur le contact à ajouter"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Passerelles"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "Identifiant utilisateur non valide"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Ce service ne contient aucun élément à parcourir."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Contact déjà dans la liste"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Le contact est déjà dans votre liste."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "Un client Jabber en GTK+"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr ""
 "Traduction française proposée par\n"
 "Yann Le Boulanger <asterix@lagaule.org>"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Requête d'inscription pour le compte %s de la part de %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Requête d'inscription de la part de %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Vous ne pouvez joindre un salon de discussion tant que vous n'êtes pas "
 "connecté."
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Rejoindre un salon de discussion en tant que %s"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Rejoindre un salon de discussion"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Commencer une discussion avec le compte %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Commencer une discussion"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -719,158 +738,165 @@ msgstr ""
 "envoyer un message"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Vous devez être connecté pour changer votre mot de passe."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Vous devez entrer un mot de passe."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Nouveau message"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Nouveau message simple"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Requête de transfert de fichier"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Erreur de Transfert de Fichier"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Transfert de Fichier Terminé"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Transfert de Fichier Arrêté"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 msgid "New E-mail"
 msgstr ""
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Requête de transfert de fichier"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Erreur de Transfert de Fichier"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Transfert de Fichier Terminé"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Transfert de Fichier Arrêté"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "Aucun"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Message simple en tant que %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Message simple"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML pour %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "Console XML"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr ""
 "Contact %(contact_jid)s invité dans le salon de discussion %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Choisissez un son"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Autres"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Conférences"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Vous devez être connecté pour parcourir les services disponibles"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestion des Services"
@@ -879,11 +905,11 @@ msgstr "Gestion des Services"
 msgid "Service Discovery"
 msgstr "Gestion des Services"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Le service n'a pu être trouvé"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -891,175 +917,176 @@ 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:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Le service ne peut pas être parcouru"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Ce type de service ne contient pas d'élément à parcourir."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "en utilisant le compte %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Ce service ne contient aucun élément à parcourir."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "Re_joindre"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "_Éditer"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Scanne %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Utilisateurs"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Description"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Fichier"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Moment"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Progression"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Nom du Fichier : %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, 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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Vous"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Expéditeur : %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Destinataire : "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "sauvé dans : %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 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:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Transfert de fichier annulé"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "La connexion avec le contact ne peut être établie."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Transfert de fichier arrêté par votre contact"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Choisissez un fichier à envoyer..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Envoyer"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "En_voyer"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne peut accéder à ce fichier"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Ce fichier est utilisé par un autre processus."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Que voulez vous faire ?</b>"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Fichier : %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s souhaite vous envoyer un fichier :"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Enregistrer le Fichier sous..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Voulez-vous l'écraser ?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1067,7 +1094,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
@@ -1084,12 +1111,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:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Nom : "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Expéditeur : "
 
@@ -1097,32 +1124,32 @@ msgstr "Expéditeur : "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Continuer"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "montrer l'aide d'une commande"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "commande"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "montrer l'aide sur la commande"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Montre ou cache la fenêtre principale"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Afficher une fenêtre avec le prochain message non lu"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1130,43 +1157,43 @@ 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:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "compte"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "montrer seulement les contacts du compte spécifié"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Affiche la liste des comptes enregistrés"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Change l'état du ou des compte(s)"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "état"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "un parmi : offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "message"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "Message d'état"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1175,21 +1202,21 @@ msgstr ""
 "changer l'état de tous les compte qui ont l'option \"synchroniser avec "
 "l'état global\" activée"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows 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"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID du contact avec lequel vous voulez discuter"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1199,125 +1226,125 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "JID du contact qui recevra le message"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "contenu du message"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "clé pgp"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Si spécifié, le message sera crypté en utilisant cette clé public"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "Si spécifié, le message sera envoyé en utilisant ce compte"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Récupère les informations détaillées d'un contact"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID du contact"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Récupère les informations détaillées d'un contact"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Vous n'avez aucun compte actif"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Envoyer un fichier à un contact"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "fichier"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Chemin du fichier"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "si spécifié, le message sera envoyé en utilisant ce compte"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Liste toutes les préférences et leurs valeurs"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Définir la valeur de 'clé' à 'valeur'."
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'clé' est le nom de la préférence, 'valeur' est la valeur à assigner"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Supprime une option de préférence"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "touche"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "nom de la préférence a supprimer"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Écrit les préférences actuelles de Gajim dans le fichier .config"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Enlever le contact de la liste"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Ajouter le contact à la liste"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Ajouter un nouveau contact à ce compte."
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Renvoit l'état actuel (global à moins qu'un compte ne soit spécifié)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr "Renvoit l'état actuel (global à moins qu'un compte ne soit spécifié)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Vous avez des messages non-lus"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument manquant \"jid_contact\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1326,16 +1353,16 @@ msgstr ""
 "'%s' n'est pas dans votre liste de contact.\n"
 "Précisez le compte pour envoyer le message."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Vous n'avez aucun compte actif"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Version de dbus inconnue : %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1344,16 +1371,16 @@ msgstr ""
 "Usage : %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s non trouvé"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1362,7 +1389,7 @@ msgstr ""
 "Usage : %s commande [arguments]\n"
 "commande est l'une de :\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1371,31 +1398,31 @@ msgstr ""
 "L'argument \"%s\" n'est pas précisé. \n"
 "Tappez \"%s help %s\" pour plus d'informations"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim a besoin d'un serveur X pour s'exécuter. Fermeture..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter."
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter. Fermeture..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim a besoin de GTK 2.6+ pour s'exécuter."
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim a besoin de GTK 2.6+ pour s'exécuter. Fermeture..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "La bibliothèque GTK+ ne contient pas le support de glade"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1404,134 +1431,153 @@ msgstr ""
 "Supprimez votre version actuelle de la bibliothèque GTK+ et installez la "
 "dernière version stable à partir de %s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Veuillez vérifier que gtk et pygtk supportent libglade"
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autorisation HTTP (%s) pour %s (id : %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Acceptez vous sa requête ?"
 
-#: ../src/gajim.py:498
-#, 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."
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Contact connecté"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s vous a envoyé un nouveau message."
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Contact déconnecté"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Nouveau message privé"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nouveau message simple"
+
+#: ../src/gajim.py:610
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr ""
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "erreur en envoyant"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Autorisation acceptée"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Le contact \"%s\" vous a autorisé à voir son état."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Vous le verrez toujours déconnecté."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Le contact avec \"%s\" ne peut être établi"
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Vérifiez votre connexion ou réessayez plus tard."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s est maintenant %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Votre mot de passe est incorrect"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] "Vous avez des messages non-lus"
 msgstr[1] "Vous avez des messages non-lus"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Vous avez bien reçu %(filename)s de la part de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, 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é."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vous avez bien envoyé %(filename)s à %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Le transfert du fichier %(filename)s à %(name)s est arrêté."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "la vCard a été publiée avec succés"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Vos informations personnelles ont été publiées avec succès."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1541,162 +1587,146 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Impossible de sauver vos informations de configuration"
 
-#: ../src/gajim.py:1719
-#, fuzzy
-msgid "GUI Migration failed"
-msgstr "échec lors de la publication de votre vCard"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "L'historique a été corectement récupéré."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Migration de l'historique..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Merci de patienter pendant la migration de l'historique..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Thème"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "nom du thème"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Vous ne pouvez pas supprimer le thème actuellement utilisé"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr ""
 "Veuillez tout d'abord appliquer un autre thème avant de supprimer celui-ci."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Commencer une discussion"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Commencer une discussion"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "L'envoi du message privé a échoué"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, 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/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Salons de Discussion"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Salons de Discussion"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Ce salon n'a pas de sujet"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s a été éjecté par %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a été banni : %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s a été banni par %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s est maintenant %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s est parti"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s est maintenant %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Surnom introuvable : %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, 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."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s semble ne pas être un JID valide"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "Cette commande n'existe pas: /%s (précédez la de /say pour l'envoyer)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Commandes : %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1709,7 +1739,7 @@ msgstr ""
 "actuellement dans le salon il sera également éjecté. Ne supporte pas les "
 "espaces dans le surnom."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1717,12 +1747,12 @@ msgstr ""
 "Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant "
 "spécifié."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage : /%s, nettoie la fenêtre."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1731,12 +1761,12 @@ msgstr ""
 "Usage : /%s [raison], ferme la fenêtre ou l'onglet courrant en affichant la "
 "raison si spécifiée."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Usage : /%s, passe la fenêtre de salon de discussion en vue compacte."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1745,7 +1775,7 @@ msgstr ""
 "Usage : /%s <JID> [raison], invite le JID dans le salon actuel, la raison "
 "est optionnelle."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1754,7 +1784,7 @@ msgstr ""
 "Usage : /%s <salon>@<serveur>[/surnom], propose de rejoindre salon@serveur "
 "en option on peut spécifier le surnom utilisé."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1765,7 +1795,7 @@ msgstr ""
 "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
 "contenir d'espaces !"
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1774,7 +1804,7 @@ msgstr ""
 "Usage : /%s <action>, envoie l'action au salon actuel. Utilise la troisième "
 "personne. (ex : /%s explose.)"
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1783,89 +1813,89 @@ msgstr ""
 "Usage : /%s <surnom> [message]. ouvre une fenêtre de message privé puis "
 "envoit le message à l'occupant portant le surnom spécifié."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Usage : /%s <surnom>, change votre surnom dans ce salon."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Usage : /%s <message>, envoie un message sans chercher d'autres commandes."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Pas d'aide disponible pour /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Êtes-vous sûr de vouloir quitter le salon \"%s\" ?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Si vous fermez cette fenêtre, vous serez déconnecté de ce salon."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_Ne plus poser la question."
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Changement de Sujet"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Saisissez le nouveau sujet :"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Changement de Surnom"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Marque-page déjà spécifié"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "Le salon \"%s\" est déjà dans vos marque-pages."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Marque-page ajouté avec succès"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 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."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison ci-dessous :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
@@ -1913,111 +1943,120 @@ msgstr "<b>Éditeur de Configuration avancée</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Applications</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Personnalisé</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Description</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Format d'une ligne de discussion</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Personnalisation de l'interface</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Trafic Jabber</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Divers</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informations personnelles</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Choisissez une des options suivantes :</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Remplissez les informations pour votre nouveau compte</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Choisissez une des options suivantes :</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Messages d'état prédéfinis</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Propriétés</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Réglages</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Sons</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Taper votre nouveau message d'état :"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notifications visuelles</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Que voulez vous faire ?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrée XML</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Une liste des transferts de fichier actifs, terminés et arrêtés"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "_Comptes"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Après le surnom :"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "À propos"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Accepter"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Compte"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2029,52 +2068,44 @@ msgstr ""
 "Contact\n"
 "Bannière"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Modification du compte"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "Actions a_vancées"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Ajouter un nouveau contact"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Notifications visuelles</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Ajouter un _contact"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Avancées"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Éditeur de configuration avancée"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Après le surnom :"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Après l'heure :"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2084,58 +2115,58 @@ msgstr ""
 "En train de composer seulement\n"
 "Aucun"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr ""
 "Autoriser l'envoi des informations concernant votre _système d'exploitation"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "L'autoriser à voir mon état"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Autoriser les notifications lorsque je suis _absent/indisponible/occupé/"
 "invisible"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "Aussi appellé style iChat"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Demander le message d'état lorsque je me : "
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Lui demander à voir son état"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Demande :"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Assigner une clé Open_PGP"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Autoriser le contact à savoir quand vous êtes connecté"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Passer _absent après :"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Passer _indisponible après :"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Rejoindre automatiquement"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2147,15 +2178,15 @@ msgstr ""
 "Toujours utiliser les applications par défaut de KDE\n"
 "Personnalisé"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Autoriser automatiquement le contact à voir mon état"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Reconnexion automatique quand la connexion est perdue"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2168,13 +2199,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Avant le surnom :"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Avant l'heure :"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Avant le surnom :"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2291,134 +2319,138 @@ msgid "Company:"
 msgstr "Entreprise :"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Configurer le _Salon"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Se connecter quand je clique sur Finir"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Connexion"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Informations"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "_Informations"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "Historique de Conversation"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "Pays :"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "Icônes d'é_tat par défaut :"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Supprimer MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Supprimer le message du jour"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Supprime le message du jour"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Refuser"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 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é"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Département :"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "_Afficher les avatars des contacts dans la fenêtre principale"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+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:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "Courriel :"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "Toutes les 5 _minutes"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Éditer les groupes"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "_Éditer les informations personnelles..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Éditer les _groupes"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Gérer les frimousses"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Activer"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Entrez le de nouveau pour confirmer :"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Entrez un nouveau mot de passe :"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Événements"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "Toutes les 5 _minutes"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Adresse 2 :"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Famille :"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Transfert de fichiers"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "_Transfert de fichiers"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Gestionnaire de fichiers :"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Filtre :"
@@ -2428,39 +2460,35 @@ msgid "Font style:"
 msgstr "Style de la police :"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Police :"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Lui interdire de voir mon état"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Format : AAAA-MM-JJ"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Foire Aux Questions (en ligne)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "De :"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "Parc_ourir"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Personalisation des thèmes de Gajim"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2470,7 +2498,7 @@ msgstr ""
 "Gajim peut envoyer et recevoir des meta-informations concernant les "
 "conversations que vous pouvez avoir avec un contact"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2478,7 +2506,7 @@ 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:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2487,7 +2515,7 @@ msgstr ""
 "Gajim vous signalera les nouveaux messages dans une fenêtre de notification "
 "en bas à droite de l'écran"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2495,7 +2523,7 @@ msgstr ""
 "Gajim vous signalera par une fenêtre de notification en bas à droite de "
 "l'écran qu'un contact s'est connecté"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2503,26 +2531,34 @@ msgstr ""
 "Gajim vous signalera par une fenêtre de notification en bas à droite de "
 "l'écran qu'un contact s'est déconnecté"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajim ne fera que changer l'icône du contact qui a envoyé le nouveau message"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim : Assistant de création de compte"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Général"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Prénom :"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Aucun"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Groupe :"
@@ -2570,21 +2606,25 @@ msgid "I would like to add you to my contact list."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
 #: ../src/gtkgui.glade.h:170
-msgid "If checked, Gajim will also have a trayicon"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
 msgstr ""
-"Si cette case est cochée, Gajim placera une icône dans la zone de "
-"notification"
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale"
@@ -2668,8 +2708,9 @@ msgstr ""
 "tous les contacts comme si vous n'aviez qu'un seul compte"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Message entrant :"
+#, fuzzy
+msgid "Inactive"
+msgstr "Actif"
 
 #. 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:185
@@ -2705,39 +2746,57 @@ msgid "Location"
 msgstr "Adresse"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Message"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Modifier..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Gérer les comptes"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Gérer les Marque-pages"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Gérer les profils de proxys"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Modifier..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Second prénom :"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "Mo_dérateur"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Complément"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2745,109 +2804,105 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Surnom :"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Aucun"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Me Signaler quand un contact se : "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "Syst. d'exploit. :"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "À chaque _message"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 #, fuzzy
 msgid "One message _window:"
 msgstr "Envoyer le message et fermer la fenêtre"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Ouvrir..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Message sortant :"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "_Mot de passe : "
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Mot de passe"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Pause"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Informations personnelles"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Téléphone :"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Jouer les _sons"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Port : "
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Poste :"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Code postal :"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Préférences"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Titre :"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "Message d'état"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Afficher l'heure :"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Priori_té :"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2857,60 +2912,52 @@ msgstr ""
 "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:237
-msgid "Profile, Avatar"
-msgstr "Profil, Avatar"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Proxy :"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Construire une Requête..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Récemment :"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "S'enregistrer à"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Supprimer le compte de Gajim _uniquement"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Supprimer le compte de Gajim et du _serveur"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Supprimer le transfert de fichier de la liste."
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 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"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Repondre à ce message"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Utiliser les couleurs par défaut"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "Ressour_ce: "
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2924,170 +2971,162 @@ msgstr ""
 "en même temps. La ressource avec la plus haute priorité recevra les messages "
 "(voir plus bas)."
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Ressource :"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Fonction :"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Configuration du salon de discussion"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Salon :"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Enregistrer votre mot de _passe (non sécurisé)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 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"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Enregistrer le Fichier sous..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Garder l'_historique des conversations pour tous les contacts"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Enregistrer le mot de _passe"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Search"
 msgstr "_Rechercher"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "_Envoyer"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Envoyer un Fichier"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Envoyer un _message simple"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Envoyer un _fichier"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Envoyer un _nouveau message..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Envoi des paquets de maintien de connexion"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Envoyer un message"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Envoyer le message et fermer la fenêtre"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 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:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Serveur :"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Fonctionalités des Serveurs"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Définir MOTD"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Définir un message du jour"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Choisir un _avatar"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Définir un avatar à la connexion"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Mets un message du jour"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Montrer tous les _événements en attente"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Montrer les contacts déc_onnectés"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Montrer la _liste de contacts"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Montrer la console _XML"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Ne montrer que dans la _liste"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 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:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "_connecte"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "_déconnecte"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Trier les contacts en fonction de leur état"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "É_tat"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Commencer une _discussion"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "État :"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "État"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Message d'état :"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "État :"
@@ -3118,25 +3157,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Synch_roniser l'état du compte avec l'état global"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Thème :"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "_Couleur du texte :"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "_Police du texte :"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "Le message automatique pour l'état \"absent\""
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "Le message automatique pour l'état \"non disponible\""
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Thème :"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3162,52 +3202,58 @@ msgid "Type:"
 msgstr "Type :"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Souligner"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "Mettre à jour MOTD"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Mettre à jour le message du jour"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Mets à jour le message du jour"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Utiliser _SSL"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "Utiliser les icônes des pa_sserelles"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Utiliser l'authentification"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Utiliser un nom d'hôte/port personnalisé"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "liste des transferts de fichier"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Icône dans la zone de notification"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "Identifiant :"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 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"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3220,21 +3266,21 @@ msgstr ""
 "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:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Quand un nouvel événement est reçu"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Emploi"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3242,414 +3288,453 @@ msgstr ""
 "Vous devez avoir un compte pour vous connecter\n"
 "au réseau Jabber."
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Votre Identifiant Jabber :"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "_Ajouter un Contact..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "_Ajouter à la liste de contacts"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Adresse :"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Administrateur"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "_Avancées"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Après l'heure :"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Autoriser"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "_Arrière-plan :"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Bannir"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Avant l'heure :"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "Ajouter ce salon aux _Marque-pages"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "Vue _Compacte    Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "_Copier le JID/l'Adresse électronique"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Copier l'Adresse du Lien"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Refuser"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Découvrir les services"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Découvrir les services..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Gestionnaire de fichiers :"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Filtre :"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Finir"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Police :"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "_Salons de discussion"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "_Souligner les fautes d'orthographe"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_Historique"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Icône dans la zone de notification"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer les messages des contacts qui ne sont pas dans votre liste"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Message entrant :"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "Identifiant _Jabber : "
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "Re_joindre un nouveau salon..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "_Éjecter"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "_Historique de Conversation"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "_Inscrire dans l'historique les changements d'état des contacts"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "Logiciel de courriel :"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Membre"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "_Regrouper les comptes"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Message"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Modifier"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "_Modifier le Compte..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Nom : "
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Jamais"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "Me le _signaler"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "Me _signaler quand un transfert de fichier est terminé"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "_Pouvoirs du contact"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "Utilisateurs En _Ligne"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Ouvrir le logiciel de Courriel"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir le Lien dans votre navigateur"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Ouvrir..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Message sortant :"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "P_ossesseur"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "Mot de _passe : "
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Programme pour lire les sons :"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "L'_afficher"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Port :"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Présence"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Publier"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "_Enlever de la liste de contacts"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Utiliser les couleurs par défaut"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Récupérer"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "Mot de _passe : "
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Rechercher"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "En_voyer"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "_Envoyer et Fermer"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "_Envoyer un message privé"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "_Envoyer un message au serveur"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "_Envoyer un message simple"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Serveur :"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Trier les contacts en fonction de leur état"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "_Commencer une discussion"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "É_tat"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Message d'état :"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Ajouter"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Autorisation"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+msgid "_URL:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Utiliser un proxy"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "_Nom :"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Voix"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "Console _XML..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "liste des transferts de fichier"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "minutes"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Erreur de lecture du fichier :"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Erreur lors de l'analyse du fichier :"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 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"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Rechercher"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Supprimer MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Rechercher"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "création de la base de donnée de l'historique"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3658,36 +3743,36 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Migration de l'historique..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Date"
@@ -3721,77 +3806,83 @@ msgstr "L'état est maintenant : %(status)s : %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "L'état est maintenant : %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Message"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Commencer une discussion avec le compte %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Comptes regroupés"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 #, fuzzy
 msgid "Observers"
 msgstr "Serveur"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Vous êtes déjà dans le salon %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr ""
 "Vous ne pouvez pas joindre un salon de discussion tant que vous êtes "
 "invisible."
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "Re_joindre un nouveau salon"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Gérer les Marque-pages..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "au compte %s"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "en utilisant le compte %s"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "en utilisant le compte %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Gérer les Marque-pages..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_Historique"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "Re_joindre un nouveau salon"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "La passerelle \"%s\" sera enlevée"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3799,67 +3890,76 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages aux contacts de cette "
 "passerelle."
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Choisissez une clé à assigner au contact"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "Re_nommer"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "_Connecter"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "_Déconnecter"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "L'Autorisation a été envoyée"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, 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:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "L'Autorisation a été supprimée"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, 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:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"En supprimant ce contact, vous supprimez également son autorisation. Il vous "
+"verra donc toujours déconnecté."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3867,37 +3967,37 @@ msgstr ""
 "En supprimant ce contact, vous supprimez également son autorisation. Il vous "
 "verra donc toujours déconnecté."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 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:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, 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:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Mot de passe"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3905,20 +4005,20 @@ msgstr ""
 "Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-"
 "vous sûr de vouloir être invisible ?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 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."
 
-#: ../src/roster_window.py:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Vous avez des messages non-lus"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3926,151 +4026,139 @@ msgstr ""
 "Les messages seront disponibles à une lecture ultérieure si l'archivage de "
 "l'historique est actif."
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "De la part de %s dans le salon %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Envoyer un fichier à un contact"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Changer le message d'état..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Changer le message d'état..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Cacher ce menu"
 
-#: ../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/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %d message non-lu"
 msgstr[1] "Gajim - %d messages non-lus"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - %d message simple non-lu"
 msgstr[1] "Gajim - %d messages simples non-lus"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - %d message de salon non-lu"
 msgstr[1] "Gajim - %d messages de salon non-lus"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 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:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Fonction : "
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Affiliation : "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "État : "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Ressource : "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "État : "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Inscription : "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "Icônes d'é_tat par défaut :"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Taille : %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Type : "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Télécharger"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Envoyer"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Taille : "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Type : "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Transféré : "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Non commencé"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Terminé"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Pause"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Calé"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "En train de transférer"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Ce service n'a pas encore renvoyé d'informations détaillées"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4078,40 +4166,40 @@ msgstr ""
 "Ce service n'a pas renvoyé d'informations détaillées.\n"
 "Il est probablement défectueux ou cassé"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Choisissez un Avatar"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Images"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Parcourt %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 "Ce contact s'intéresse à votre état mais vous ne vous intéressez au sien"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4119,12 +4207,12 @@ msgstr ""
 "Vous vous intéressez à l'état de ce contact mais il ne s'intéresse pas au "
 "votre"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Vous et ce contact vous intéressez à vos états réciproques"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4132,24 +4220,24 @@ msgstr ""
 "Vous n'êtes pas intéressé par l'état de ce contact et il ne s'intéressepas "
 "au votre"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Vous attendez la réponse de ce contact pour votre demande de voir son état"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr "Vous devez être connecté pour publier vos informations."
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "Vous devez être connecté pour récupérer vos informations."
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 #, fuzzy
 msgid "Personal details"
 msgstr "Informations personnelles"
@@ -4193,45 +4281,47 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus n'est pas présent sur cette machine"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "Le bus de session n'est pas disponible"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Utilise DBus et Notification-Daemon pour afficher les notifications"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Temps en minutes, au bout duquel votre état basculera absent."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Absent car inactif"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Temps en minutes après lequel votre état basculera non disponible."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Non disponible car inactif"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 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:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Ajouter * et [n] au titre de la liste des contacts ?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4239,12 +4329,12 @@ msgstr ""
 "Nombre de lignes de l'historique à afficher lorsque l'onglet ou la fenêtre "
 "de discussion est ouvert à nouveau."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 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."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4252,22 +4342,22 @@ 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:133
+#: ../src/common/config.py:136
 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)."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Utiliser la vue compacte quand vous ouvrez une fenêtre de discussion"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Utiliser la vue compacte quand vous ouvrez une fenêtre de salon"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4276,31 +4366,31 @@ 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:141
+#: ../src/common/config.py:144
 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."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Demander avant de fermer un onglet ou une fenêtre de discussion."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Demander avant de fermer un onglet ou une fenêtre de discussion."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Demander avant de fermer un onglet ou une fenêtre de discussion."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4308,23 +4398,23 @@ 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:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "D'après le standard IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Montrer l'onglet quand il n'y a qu'une discussion ?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Montrer l'onglet quand il n'y a qu'une discussion ?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Afficher le bouton fermer sur l'onglet ?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4332,7 +4422,7 @@ msgstr ""
 "Une liste de mots séparés par des points-virgules qui seront mis en "
 "surbrillance dans les salons."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4341,11 +4431,11 @@ msgstr ""
 "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:177
+#: ../src/common/config.py:180
 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:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4353,7 +4443,7 @@ 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:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4361,7 +4451,7 @@ 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:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4370,7 +4460,7 @@ msgstr ""
 "précédente ou dont la version en cache a expiré."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4378,20 +4468,20 @@ 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:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4402,14 +4492,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Dors"
@@ -4478,185 +4579,99 @@ 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:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "Vert"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "épicerie"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "Humain"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "Standard"
-
-#: ../src/common/connection.py:68
-#, fuzzy
-msgid "Unable to load idle module"
-msgstr "Impossible de rejoindre le salon"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Impossible de rejoindre le salon"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "Un mot de passe est requis pour rejoindre ce salon."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Vous êtes banni de ce salon."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Ce salon n'existe pas."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "La création de salon est réservée aux administrateurs."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Vous n'êtes pas dans la liste des membres."
-
-#: ../src/common/connection.py:583
-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"
-"Veuillez entrer un autre surnom ci-dessous :"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-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:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "nous sommes maintenant inscrits chez %s"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Requête de désinscription de la part de %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "nous ne sommes plus dans la liste de %s"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Pour continuer à envoyer et recevoir des messages, vous devez vous "
 "reconnecter."
 
-#: ../src/common/connection.py:1464
-#, fuzzy, 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"
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Mot de passe invalide"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Mot de passe invalide"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossible de se connecter à \"%s\""
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Connecté au serveur %s:%s avec %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Vérifiez votre connexion ou réessayer plus tard"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Echec de l'authentification avec \"%s\""
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 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:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "Mot de passe OpenPGP non renseigné"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, 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:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "invisible"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "Déconnecté"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Je suis %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[ce message est chiffré]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4665,209 +4680,206 @@ msgstr ""
 "Sujet : %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr ""
-"L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
-"temps"
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
+msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Caractère non valide dans le nom d'utilisateur."
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Adresse du serveur requise."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Caractère non valide dans le nom d'hôte."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Caractère non valide dans la ressource."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s Go"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mo"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s Ko"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "O_ccupé"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Occupé"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_Non disponible"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Non disponible"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "Dis_ponible pour discuter"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Disponible pour discuter"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "_Disponible"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Disponible"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Connexion"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "_Absent"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Absent"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "Déc_onnecté"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "Inconnu"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "a une erreur"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "À"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Les deux"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "S'inscrire"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "Aucun"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Modérateurs"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Modérateur"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Visiteurs"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Visiteur"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "prête attention à la conversation"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "fait quelque chose d'autre"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "écrit un message..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "a arrêté d'écrire un message"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "a fermé la fenêtre ou l'onglet de discussion"
 
@@ -4877,10 +4889,111 @@ msgstr "a fermé la fenêtre ou l'onglet de discussion"
 msgid "error: cannot open %s for reading"
 msgstr "erreur: impossible d'ouvrir %s en lecture"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "Standard"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "Cyan"
 
+#~ msgid "Send"
+#~ msgstr "Envoyer"
+
+#~ 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."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s vous a envoyé un nouveau message."
+
+#, fuzzy
+#~ msgid "GUI Migration failed"
+#~ msgstr "échec lors de la publication de votre vCard"
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "L'historique a été corectement récupéré."
+
+#~ 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"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Profil, Avatar"
+
+#~ msgid "_Online Users"
+#~ msgstr "Utilisateurs En _Ligne"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Commencer une discussion avec le compte %s"
+
+#~ 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"
+
+#~ msgid "Size: "
+#~ msgstr "Taille : "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "Le bus de session n'est pas disponible"
+
+#, fuzzy
+#~ msgid "Unable to load idle module"
+#~ msgstr "Impossible de rejoindre le salon"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Impossible de rejoindre le salon"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Un mot de passe est requis pour rejoindre ce salon."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Vous êtes banni de ce salon."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Ce salon n'existe pas."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "La création de salon est réservée aux administrateurs."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Vous n'êtes pas dans la liste des membres."
+
+#~ 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"
+#~ "Veuillez entrer un autre surnom ci-dessous :"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "nous sommes maintenant inscrits chez %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "Requête de désinscription de la part de %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "nous ne sommes plus dans la liste de %s"
+
+#, fuzzy
+#~ 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 "Registration information for transport %s has not arrived in time"
+#~ msgstr ""
+#~ "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
+#~ "temps"
+
 #~ msgid "Sound"
 #~ msgstr "Son"
 
diff --git a/po/gajim.pot b/po/gajim.pot
index fd19e2a4b..e9fedf620 100644
--- a/po/gajim.pot
+++ b/po/gajim.pot
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\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"
@@ -53,7 +53,7 @@ msgid "Hidden"
 msgstr ""
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -64,80 +64,77 @@ msgid ""
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr ""
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr ""
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 msgid "Chats"
 msgstr ""
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr ""
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr ""
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr ""
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr ""
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr ""
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr ""
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -181,187 +178,199 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr ""
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr ""
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+msgid "To change the account name, you must read all pending events."
+msgstr ""
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr ""
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr ""
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr ""
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr ""
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 
-#: ../src/config.py:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr ""
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr ""
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr ""
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 msgid "You must create your account before editing your personal information."
 msgstr ""
 
-#: ../src/config.py:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr ""
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 
-#: ../src/config.py:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr ""
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 
-#: ../src/config.py:1366
+#: ../src/config.py:1376
 msgid "OpenPGP Key Selection"
 msgstr ""
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr ""
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr ""
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr ""
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr ""
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr ""
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr ""
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 msgid "Member List"
 msgstr ""
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 msgid "Owner List"
 msgstr ""
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 msgid "Administrator List"
 msgstr ""
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr ""
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 msgid "Nick"
 msgstr ""
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 msgid "Role"
 msgstr ""
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 msgid "Banning..."
 msgstr ""
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 msgid "Adding Administrator..."
 msgstr ""
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -371,93 +380,101 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr ""
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr ""
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr ""
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr ""
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr ""
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr ""
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr ""
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr ""
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr ""
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr ""
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr ""
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr ""
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr ""
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 msgid "You must enter a password for the new account."
 msgstr ""
 
-#: ../src/config.py:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr ""
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr ""
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+msgid "Duplicate Jabber ID"
+msgstr ""
+
+#: ../src/config.py:2574
+msgid "This account is already configured in Gajim."
+msgstr ""
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr ""
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr ""
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr ""
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr ""
 
@@ -514,314 +531,319 @@ msgid "Subject: %s\n"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr ""
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr ""
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr ""
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr ""
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr ""
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr ""
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr ""
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr ""
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr ""
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr ""
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr ""
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 msgid "Save as Preset Status Message"
 msgstr ""
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 msgid "Please type a name for this status message"
 msgstr ""
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr ""
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr ""
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr ""
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr ""
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr ""
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr ""
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr ""
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr ""
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr ""
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr ""
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 msgid "Invalid room or server name"
 msgstr ""
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr ""
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr ""
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 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:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr ""
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr ""
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr ""
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr ""
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr ""
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr ""
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr ""
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr ""
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr ""
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr ""
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr ""
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr ""
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 msgid "New E-mail"
 msgstr ""
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr ""
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr ""
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr ""
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr ""
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+msgid "Groupchat Invitation"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr ""
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr ""
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr ""
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, python-format
 msgid "Received %s"
 msgstr ""
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr ""
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr ""
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr ""
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr ""
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr ""
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr ""
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr ""
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr ""
@@ -830,184 +852,185 @@ msgstr ""
 msgid "Service Discovery"
 msgstr ""
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr ""
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr ""
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr ""
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr ""
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr ""
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr ""
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr ""
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr ""
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr ""
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr ""
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr ""
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr ""
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr ""
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr ""
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr ""
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr ""
 
 #. 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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr ""
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr ""
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr ""
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr ""
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr ""
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr ""
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr ""
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
 msgstr ""
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr ""
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr ""
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr ""
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr ""
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr ""
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr ""
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr ""
@@ -1015,7 +1038,7 @@ msgstr ""
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr ""
@@ -1032,12 +1055,12 @@ msgstr ""
 msgid "It is not possible to send empty files"
 msgstr ""
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr ""
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr ""
 
@@ -1045,415 +1068,434 @@ msgstr ""
 msgid "Pause"
 msgstr ""
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr ""
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr ""
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr ""
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr ""
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr ""
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr ""
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr ""
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr ""
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr ""
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr ""
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr ""
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr ""
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 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 ""
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr ""
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 ""
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr ""
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr ""
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr ""
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr ""
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr ""
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 msgid "Gets detailed info on a account"
 msgstr ""
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 msgid "Name of the account"
 msgstr ""
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr ""
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr ""
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr ""
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr ""
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr ""
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr ""
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr ""
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr ""
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr ""
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr ""
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr ""
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr ""
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr ""
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 msgid "Returns number of unreaded messages"
 msgstr ""
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr ""
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr ""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
 "\t %s"
 msgstr ""
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr ""
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr ""
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 msgstr ""
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 msgstr ""
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr ""
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr ""
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr ""
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr ""
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr ""
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr ""
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 msgstr ""
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr ""
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr ""
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr ""
 
-#: ../src/gajim.py:498
+#: ../src/gajim.py:436
 #, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+msgid "%(nickname)s Signed In"
 msgstr ""
 
-#: ../src/gajim.py:553
+#: ../src/gajim.py:467
 #, python-format
-msgid "%s has sent you a new message."
+msgid "%(nickname)s Signed Out"
 msgstr ""
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, python-format
+msgid "New Private Message from room %s"
+msgstr ""
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr ""
+
+#: ../src/gajim.py:610
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr ""
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr ""
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr ""
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr ""
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr ""
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr ""
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr ""
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr ""
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr ""
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr ""
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr ""
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr ""
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr ""
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr ""
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr ""
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1461,155 +1503,140 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr ""
 
-#: ../src/gajim.py:1719
-msgid "GUI Migration failed"
-msgstr ""
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr ""
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr ""
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr ""
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr ""
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr ""
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr ""
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 msgid "Private Chat"
 msgstr ""
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 msgid "Private Chats"
 msgstr ""
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr ""
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr ""
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chats"
 msgstr ""
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr ""
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr ""
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr ""
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr ""
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1618,44 +1645,44 @@ msgid ""
 "spaces in nickname."
 msgstr ""
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr ""
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr ""
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr ""
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr ""
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
 "providing a reason."
 msgstr ""
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 msgstr ""
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1663,99 +1690,99 @@ msgid ""
 "nickname."
 msgstr ""
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
 "g. /%s explodes.)"
 msgstr ""
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
 "message to the occupant specified by nickname."
 msgstr ""
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr ""
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr ""
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr ""
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 msgid "Do _not ask me again"
 msgstr ""
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr ""
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr ""
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr ""
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr ""
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr ""
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr ""
@@ -1798,109 +1825,117 @@ msgstr ""
 msgid "<b>Applications</b>"
 msgstr ""
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 msgid "<b>Please modify your special notification below</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 msgid "<b>Type your new status message</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr ""
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+msgid "A_fter nickname:"
+msgstr ""
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -1908,106 +1943,98 @@ msgid ""
 "Banner"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 msgid "Add Special _Notification"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
 "Disabled"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2015,15 +2042,15 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2036,12 +2063,8 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
+msgid "B_efore nickname:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:81
@@ -2148,129 +2171,129 @@ msgid "Company:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:106
-msgid "Configure _Room"
+msgid "Composing"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:107
-msgid "Connect when I press Finish"
+msgid "Configure _Room"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:108
-msgid "Connection"
+msgid "Connect when I press Finish"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:109
-msgid "Contact Information"
+msgid "Connection"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:110
-msgid "Contact _Info"
+msgid "Contact Information"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:111
-msgid "Conversation History"
+msgid "Contact _Info"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:112
-msgid "Country:"
+msgid "Conversation History"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+msgid "Country:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:114
-msgid "Delete MOTD"
+msgid "Default status _iconset:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:115
-msgid "Delete Message of the Day"
+msgid "Delete MOTD"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:116
-msgid "Deletes Message of the Day"
+msgid "Delete Message of the Day"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:117
-msgid "Deny"
+msgid "Deletes Message of the Day"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:118
-msgid "Deny authorization from contact so he cannot know when you're connected"
+msgid "Deny"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:119
-msgid "Department:"
+msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+msgid "Department:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+msgid "Display a_vatars of contacts in roster"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:122
-msgid "E-Mail:"
+msgid "Display status _messages of contacts in roster"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:123
-msgid "Edit Groups"
+msgid "E-Mail:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:124
-msgid "Edit Personal Information..."
+msgid "E_very 5 minutes"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:125
-msgid "Edit _Groups"
+msgid "Edit Groups"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:126
+msgid "Edit Personal Information..."
+msgstr ""
+
+#: ../src/gtkgui.glade.h:127
+msgid "Edit _Groups"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:128
 msgid "Emoticons:"
 msgstr ""
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr ""
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:137
-msgid "File _Transfers"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:138
-msgid "File manager:"
+msgid "File _Transfers"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:139
@@ -2282,86 +2305,89 @@ msgid "Font style:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
 "send to the other party."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 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:153
+#: ../src/gtkgui.glade.h:152
 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:154
+#: ../src/gtkgui.glade.h:153
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr ""
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr ""
 
+#: ../src/gtkgui.glade.h:158
+msgid "Gone"
+msgstr ""
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr ""
@@ -2407,17 +2433,21 @@ msgid "I would like to add you to my contact list."
 msgstr ""
 
 #: ../src/gtkgui.glade.h:170
-msgid "If checked, Gajim will also have a trayicon"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
 msgstr ""
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:172
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:173
@@ -2479,7 +2509,7 @@ msgid ""
 msgstr ""
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
+msgid "Inactive"
 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)
@@ -2516,39 +2546,55 @@ msgid "Location"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:194
-msgid "Manage Accounts"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:195
-msgid "Manage Bookmarks"
+msgid ""
+"MUC\n"
+"Messages"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+msgid "Ma_nage..."
+msgstr ""
+
+#: ../src/gtkgui.glade.h:199
+msgid "Manage Accounts"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:200
+msgid "Manage Bookmarks"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr ""
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2556,166 +2602,154 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 msgid "One message _window:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr ""
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:224
-msgid "Personal Information"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:225
-msgid "Phone No.:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:226
-msgid "Play _sounds"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:227
-msgid "Port: "
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:228
-msgid "Position:"
+msgid "Personal Information"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:229
-msgid "Postal Code:"
+msgid "Phone No.:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:230
+msgid "Play _sounds"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:231
+msgid "Port: "
+msgstr ""
+
+#: ../src/gtkgui.glade.h:232
+msgid "Position:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:233
+msgid "Postal Code:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr ""
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 msgid "Preset messages:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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:237
-msgid "Profile, Avatar"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2724,164 +2758,156 @@ msgid ""
 "has the highest priority will get the events. (see below)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 msgid "Save as Preset..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 msgid "Search"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 msgid "Sends a message to currently connected users to this server"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Shows a list of file transfers between you and other"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:289
-msgid "Status"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:290
-msgid "Status message:"
+msgid "Status"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:291
@@ -2914,23 +2940,23 @@ msgid "Synch_ronize account status with global status"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:299
-msgid "Text _color:"
+msgid "T_heme:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:300
-msgid "Text _font:"
+msgid "Text _color:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:301
-msgid "The auto away status message"
+msgid "Text _font:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:302
-msgid "The auto not available status message"
+msgid "The auto away status message"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:303
-msgid "Theme:"
+msgid "The auto not available status message"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:304
@@ -2956,50 +2982,54 @@ msgid "Type:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr ""
 
+#: ../src/gtkgui.glade.h:317
+msgid "Use file transfer proxies"
+msgstr ""
+
 #: ../src/gtkgui.glade.h:318
-msgid "User ID:"
+msgid "Use t_rayicon (aka. notification area icon)"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:319
-msgid "When a file transfer is complete show a popup notification"
+msgid "User ID:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:320
+msgid "When a file transfer is complete show a popup notification"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:321
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. Please note that "
@@ -3007,430 +3037,459 @@ msgid ""
 "you are not already chatting with"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr ""
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:336
-msgid "_Authorize"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:337
-msgid "_Background:"
+msgid "_After time:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:338
-msgid "_Ban"
+msgid "_Authorize"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:339
-msgid "_Bookmark This Room"
+msgid "_Background:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:340
-msgid "_Browser:"
+msgid "_Ban"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:341
-msgid "_Cancel"
+msgid "_Before time:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:342
-msgid "_Compact View    Alt+C"
+msgid "_Bookmark This Room"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:343
-msgid "_Contents"
+msgid "_Browser:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:344
+msgid "_Cancel"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:345
-msgid "_Copy JID/Email Address"
+msgid "_Compact View    Alt+C"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:346
-msgid "_Copy Link Location"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:347
-msgid "_Deny"
+msgid "_Contents"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:348
-msgid "_Discover Services"
+msgid "_Copy JID/Email Address"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:349
-msgid "_Discover Services..."
+msgid "_Copy Link Location"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:350
+msgid "_Deny"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:351
-msgid "_FAQ"
+msgid "_Discover Services"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:352
-msgid "_Filter:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:353
-msgid "_Finish"
+msgid "_Discover Services..."
 msgstr ""
 
 #: ../src/gtkgui.glade.h:354
-msgid "_Group Chat"
+msgid "_FAQ"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:355
-msgid "_Help"
+msgid "_File manager:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:356
-msgid "_Highlight misspelled words"
+msgid "_Filter:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:357
-msgid "_History"
+msgid "_Finish"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:358
+msgid "_Font:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:359
+msgid "_Group Chat"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:360
+msgid "_Help"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:361
+msgid "_Highlight misspelled words"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:362
+msgid "_History"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:363
-msgid "_Jabber ID:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:365
-msgid "_Join New Room..."
-msgstr ""
-
-#: ../src/gtkgui.glade.h:366
-msgid "_Kick"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:367
-msgid "_Log conversation history"
+msgid "_Incoming message:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:368
-msgid "_Log status changes of contacts"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:369
-msgid "_Mail client:"
+msgid "_Jabber ID:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:370
-msgid "_Member"
+msgid "_Join New Room..."
 msgstr ""
 
 #: ../src/gtkgui.glade.h:371
-msgid "_Merge accounts"
+msgid "_Kick"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:372
-msgid "_Message"
+msgid "_Log conversation history"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:373
-msgid "_Modify"
+msgid "_Log status changes of contacts"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:374
-msgid "_Modify Account..."
+msgid "_Mail client:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:375
-msgid "_Name: "
+msgid "_Member"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:376
-msgid "_Never"
+msgid "_Merge accounts"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:377
-msgid "_Notify me about it"
+msgid "_Message"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:378
-msgid "_Notify me when a file transfer is complete"
+msgid "_Modify"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:379
-msgid "_OK"
+msgid "_Modify Account..."
 msgstr ""
 
 #: ../src/gtkgui.glade.h:380
-msgid "_Occupant Actions"
+msgid "_Name: "
 msgstr ""
 
 #: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
+msgid "_Never"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:382
+msgid "_Notify me about it"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:383
-msgid "_Open Email Composer"
+msgid "_Notify me when a file transfer is complete"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:384
-msgid "_Open Link in Browser"
+msgid "_OK"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:385
-msgid "_Owner"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:386
-msgid "_Password:"
+msgid "_Occupant Actions"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:387
-msgid "_Pause"
+msgid "_Open Email Composer"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:388
-msgid "_Player:"
+msgid "_Open Link in Browser"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:389
-msgid "_Pop it up"
+msgid "_Open..."
 msgstr ""
 
 #: ../src/gtkgui.glade.h:390
-msgid "_Port:"
+msgid "_Outgoing message:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:391
-msgid "_Preferences"
+msgid "_Owner"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:392
-msgid "_Presence"
+msgid "_Password:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:393
-msgid "_Publish"
+msgid "_Pause"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:394
-msgid "_Quit"
+msgid "_Player:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:395
-msgid "_Remove"
+msgid "_Pop it up"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
-msgid "_Remove from Roster"
+#: ../src/gtkgui.glade.h:396
+msgid "_Port:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:397
-msgid "_Rename"
+msgid "_Preferences"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:398
-msgid "_Reply"
+msgid "_Presence"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:399
-msgid "_Retrieve"
+msgid "_Publish"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:400
-msgid "_Retype Password:"
+msgid "_Quit"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:401
-msgid "_Search"
+msgid "_Remove"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
+msgid "_Remove from Roster"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
+msgid "_Rename"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:404
-msgid "_Send & Close"
+msgid "_Reply"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:405
-msgid "_Send Private Message"
+msgid "_Reset to Default Colors"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:406
-msgid "_Send Server Message"
+msgid "_Retrieve"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:407
-msgid "_Send Single Message"
+msgid "_Retype Password:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:408
-msgid "_Server:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:409
-msgid "_Start Chat"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:410
-msgid "_Status"
+msgid "_Search"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:411
-msgid "_Subscribe"
+msgid "_Send & Close"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:412
-msgid "_Subscription"
+msgid "_Send Private Message"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:413
-msgid "_Use proxy"
+msgid "_Send Server Message"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:414
-msgid "_Username:"
+msgid "_Send Single Message"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:415
-msgid "_Voice"
+msgid "_Server:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:416
-msgid "_XML Console..."
+msgid "_Sort contacts by status"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:417
-msgid "file transfers list"
+msgid "_Start Chat"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:418
+msgid "_Status"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:419
+msgid "_Status message:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:420
+msgid "_Subscribe"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:421
+msgid "_Subscription"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:422
+msgid "_URL:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:423
+msgid "_Use proxy"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:424
+msgid "_Username:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:425
+msgid "_Voice"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:426
+msgid "_XML Console..."
+msgstr ""
+
+#: ../src/gtkgui.glade.h:427
+msgid "file transfers list"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr ""
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-msgid "_Search Database"
-msgstr ""
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 msgid "Delete"
 msgstr ""
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+msgid "_Search Database"
+msgstr ""
+
+#: ../src/history_manager.py:56
 msgid "Cannot find history logs database"
 msgstr ""
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3439,35 +3498,35 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 msgid "Exporting History Logs..."
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr ""
@@ -3501,412 +3560,412 @@ msgstr ""
 msgid "Status is now: %(status)s"
 msgstr ""
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 msgid "Messages"
 msgstr ""
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, python-format
 msgid "%s - Gajim"
 msgstr ""
 
-#: ../src/notify.py:142
-msgid "Start Chat with Contact"
-msgstr ""
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr ""
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 msgid "Observers"
 msgstr ""
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr ""
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr ""
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr ""
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr ""
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr ""
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr ""
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr ""
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr ""
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr ""
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+msgid "History Manager"
+msgstr ""
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr ""
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr ""
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr ""
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr ""
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr ""
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr ""
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr ""
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr ""
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr ""
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr ""
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr ""
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr ""
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr ""
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 
-#: ../src/roster_window.py:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr ""
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+
+#: ../src/roster_window.py:1779
 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:1632
+#: ../src/roster_window.py:1780
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr ""
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr ""
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr ""
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 msgid "Wrong Passphrase"
 msgstr ""
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 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:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr ""
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: ../src/roster_window.py:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr ""
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr ""
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, python-format
 msgid "Drop %s in group %s"
 msgstr ""
 
-#: ../src/roster_window.py:2982
+#: ../src/roster_window.py:3120
 #, python-format
-msgid "Make %s as subcontact of %s"
+msgid "Make %s and %s metacontacts"
 msgstr ""
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr ""
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr ""
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr ""
 
-#: ../src/systray.py:264
-msgid "All contacts in this group are offline or have errors"
-msgstr ""
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr ""
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr ""
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr ""
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr ""
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr ""
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr ""
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr ""
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr ""
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, python-format
 msgid "Last status on %s"
 msgstr ""
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, python-format
 msgid "Since %s"
 msgstr ""
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr ""
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr ""
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr ""
 
-#: ../src/tooltips.py:593
-msgid "Size: "
+#: ../src/tooltips.py:623
+msgid "Type: "
 msgstr ""
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr ""
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr ""
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr ""
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr ""
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr ""
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr ""
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 msgstr ""
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr ""
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr ""
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, python-format
 msgid "since %s"
 msgstr ""
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr ""
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr ""
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 msgid "Personal details"
 msgstr ""
 
@@ -3948,175 +4007,177 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
 msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr ""
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr ""
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr ""
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr ""
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr ""
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr ""
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr ""
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 msgstr ""
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr ""
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr ""
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 msgstr ""
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr ""
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr ""
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr ""
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 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 ""
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr ""
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 msgstr ""
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
 msgstr ""
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 msgstr ""
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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 ""
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4127,14 +4188,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr ""
@@ -4199,382 +4271,302 @@ msgid ""
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr ""
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr ""
-
-#: ../src/common/connection.py:68
-msgid "Unable to load idle module"
-msgstr ""
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr ""
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr ""
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr ""
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr ""
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr ""
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr ""
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr ""
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-msgid "I would like to add you to my roster."
-msgstr ""
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr ""
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr ""
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr ""
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr ""
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 
-#: ../src/common/connection.py:1464
-#, 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 ""
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-msgid "Invalid answer"
-msgstr ""
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+msgid "Invalid answer"
+msgstr ""
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr ""
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr ""
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr ""
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr ""
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 msgid "Please check your login and password for correctness."
 msgstr ""
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr ""
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr ""
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr ""
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr ""
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr ""
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr ""
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
 "%s"
 msgstr ""
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
 msgstr ""
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr ""
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr ""
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr ""
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr ""
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr ""
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr ""
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr ""
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr ""
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr ""
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr ""
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr ""
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr ""
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr ""
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr ""
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr ""
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr ""
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr ""
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr ""
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr ""
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr ""
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr ""
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr ""
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr ""
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr ""
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr ""
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr ""
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr ""
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr ""
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr ""
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr ""
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr ""
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr ""
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr ""
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr ""
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr ""
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr ""
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr ""
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr ""
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr ""
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr ""
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr ""
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr ""
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr ""
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr ""
 
@@ -4584,6 +4576,10 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr ""
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr ""
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr ""
diff --git a/po/it/LC_MESSAGES/gajim.po b/po/it/LC_MESSAGES/gajim.po
index 9e48756cc..33a3873dd 100644
--- a/po/it/LC_MESSAGES/gajim.po
+++ b/po/it/LC_MESSAGES/gajim.po
@@ -5,12 +5,12 @@
 # Mauro Brenna <malloblenne@gmail.com>, 2005.
 # Andrea Ratti <scimiot@yahoo.it>, 2005.
 # Matteo Dell'Amico <della@linux.it>, 2005, 2006.
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2006-03-02 15:11+0100\n"
 "Last-Translator: Matteo Dell'Amico <della@linux.it>\n"
 "Language-Team: Italian\n"
@@ -54,7 +54,7 @@ msgid "Hidden"
 msgstr "Nascosto"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -71,63 +71,60 @@ msgstr ""
 "Non verrà usata la caratteristica di evidenziatura parole scorrette"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "Nessuna connessione disponibile"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 msgid "Your message can not be sent until you are connected."
 msgstr "Il messaggio non può venire inviato finché non si è connessi."
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Chat"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "Cifratura OpenPGP"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s non ha annunciato una chiave OpenPGP e non gliene è stata assegnata una"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Cifratura attivata"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Cifratura disattivata"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "Non nei contatti"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -135,20 +132,20 @@ msgstr ""
 "Se questa scheda viene chiusa e la cronologia è disabilitata, questo "
 "messaggio verrà perso."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Ogni %s _minuti"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Attivo"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -196,155 +193,168 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "Non è possibile usare OpenPGP su questo computer"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "Per cambiare nome account, è necessario disconnettersi."
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Il nome account non è valido"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Il nome account non può essere vuoto."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber deve essere nella forma \"utente@nomeserver\"."
 
-#: ../src/config.py:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Voce non valida"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 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:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Non si è connessi al server"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali."
 
-#: ../src/config.py:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Fallimento nella ricezione delle chiavi segrete"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Cifratura OpenPGP"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Scegliere la chiave OpenPGP"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Nessuna chiave selezionata"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr "Lista utenti bloccati"
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 msgid "Member List"
 msgstr "Lista membri"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 msgid "Owner List"
 msgstr "Lista proprietari"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 msgid "Administrator List"
 msgstr "Lista amministratori"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 msgid "Nick"
 msgstr "Nickname"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 msgid "Role"
 msgstr "Ruolo"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 msgid "Banning..."
 msgstr "Sto bloccando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -352,11 +362,11 @@ msgstr ""
 "<b>Chi si vuole bloccare?</b>\n"
 "\n"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr "Aggiunta membro..."
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -364,11 +374,11 @@ msgstr ""
 "<b>Chi si vuole rendere membro?</b>\n"
 "\n"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr "Aggiunta proprietario..."
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -376,11 +386,11 @@ msgstr ""
 "<b>Chi si vuole rendere proprietario?</b>\n"
 "\n"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 msgid "Adding Administrator..."
 msgstr "Aggiunta amministratore..."
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -388,7 +398,7 @@ msgstr ""
 "<b>Chi si vuole rendere amministratore?</b>\n"
 "\n"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -405,77 +415,87 @@ msgstr ""
 "4. dominio (il dominio corrisponde, così come qualsiasi utente@dominio,\n"
 "dominio/risorsa, o indirizzo contenente un sottodominio)."
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "L'account \"%s\" è connesso al server"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Se viene rimosso, la connessione verrà persa."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Memorizza password"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "L'account \"%s\" è connesso al server"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Se viene rimosso, la connessione verrà persa."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Nuova stanza"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 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:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Password non valida"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 msgid "You must enter a password for the new account."
 msgstr "È necessario inserire una password per il nuovo account."
 
-#: ../src/config.py:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "Le password immesse nei due campi devono essere identiche."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "ID Jabber non valido"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Questo contatto è già presente nella lista."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -484,19 +504,19 @@ msgstr ""
 "\", o farlo più tardi cliccando alla voce \"Account\" nel menu \"Modifica\" "
 "della finestra principale."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Il nuovo account è stato creato con successo"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
 
@@ -555,164 +575,163 @@ msgid "Subject: %s\n"
 msgstr "Oggetto: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "I binding python per D-Bus sono mancanti su questo computer"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Le potenzialità D-Bus di Gajim non possono essere usate"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Nome contatto: <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Trasporti"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "Nel gruppo"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Nome contatto"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "Messaggio di stato %s"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Messaggio di stato"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Messaggi di stato predefiniti</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Inserire il nuovo messaggio di stato:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Inserire i dati del contatto che si vuole aggiungere all'account %s"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Inserire i dati del contatto che si vuole aggiungere"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Trasporti"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "ID utente non valido"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Questo servizio non contiene oggetti da consultare."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Contatto già presente nella lista"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Questo contatto è già presente nella lista."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "Un client jabber GTK+"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr "GRAZIE:"
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 #, fuzzy
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Dulcis in fundo, ringranziamo tutti i gestori dei pacchetti"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr ""
 "Mauro Brenna <malloblenne@gmail.com>\n"
 "Andrea Ratti <scimiot@yahoo.it>\n"
 "Matteo Dell'Amico <della@linux.it>"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Richiesta di abbonamento per l'account %s da %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Richiesta di abbonamento da %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 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:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entra in chat di gruppo con l'account %s"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Entrare in chat di gruppo"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 msgid "Invalid room or server name"
 msgstr "Nome della stanza o del server non valido"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr "Il nome della stanza o del server contiene caratteri non permessi."
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Inizia chat con l'account %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Inizia chat"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -721,158 +740,165 @@ msgstr ""
 "mandare un messaggio di chat:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurarsi di essere connesso con \"%s\"."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Senza una connessione, non è possibile cambiare la password."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "È necessario inserire una password."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Nuovo messaggio singolo"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Richiesta di trasferimento file"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Errore nel trasferimento file"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Trasferimento file completato"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Trasferimento file fermato"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 msgid "New E-mail"
 msgstr "Nuova e-mail"
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Richiesta di trasferimento file"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Errore nel trasferimento file"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Trasferimento file completato"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Trasferimento file fermato"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "Nessuno"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Messaggio singolo con l'account %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Messaggio singolo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Invia %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML per %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "Console XML"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "Si è invitato %(contact_jid)s a %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Scegliere il suono"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Altri"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Conferenze"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Senza una connessione, non è possibile consultare i servizi disponibili"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ricerca servizi usando l'account %s"
@@ -881,11 +907,11 @@ msgstr "Ricerca servizi usando l'account %s"
 msgid "Service Discovery"
 msgstr "Ricerca servizi"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Il servizio non è stato trovato"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -893,174 +919,175 @@ msgstr ""
 "Il servizio all'indirizzo immesso non risponde o è inesistente. Controllare "
 "l'indirizzo e riprovare."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Non è possibile consultare il servizio"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Questo tipo di servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "usando l'account %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Consulta"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Questo servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Entra"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Analisi %d / %d..."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Utenti"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Descrizione"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "File"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome file: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Dimensione: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Tu"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Mittente: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Memorizzato in: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Apri cartella"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Trasferimento file annullato"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "La connessione non può essere stabilita."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Trasferimento file fermato dal contatto"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Scegliere il file da inviare..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Invia"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "_Invia"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim non riesce a leggere questo file"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Questo file è in uso da un altro processo."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Questo file esiste già"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 msgid "What do you want to do?"
 msgstr "Cosa fare?"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Descrizione: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vuole inviarti un file:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Salva file come..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Sovrascriverlo?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1068,7 +1095,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
@@ -1085,12 +1112,12 @@ msgstr "File: "
 msgid "It is not possible to send empty files"
 msgstr "Non è possibile inviare file vuoti"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Mittente: "
 
@@ -1098,75 +1125,75 @@ msgstr "Mittente: "
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Continua"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "mostra un aiuto su di un comando specifico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "mostra aiuto sul comando"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Mostra o nascondi la lista contatti"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Apre una finestra con il prossimo messaggio non letto"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr "Stampa la lista contatti. Ogni contatto appare su una linea separata"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "mostra solo i contatti dell'account dato"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Stampa un elenco degli account registrati"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Cambia lo stato degli account"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "stato"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "uno fra: offline, online, chat, assente, xa, non disturbare, invisibile"
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "messaggio"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "messaggio di stato"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1175,20 +1202,20 @@ msgstr ""
 "cambiare lo stato di tutti gli account che hanno marcato l'opzione "
 "\"sincronizza con lo stato globale\""
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Mostra la finestra di chat per mandare messaggi ad un contatto"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contatto con cui si vuole chattare"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se specificato, il contatto è preso dalla lista contatti di questo account"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1198,130 +1225,130 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "JID del contatto che riceverà il messaggio"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "contenuti messaggi"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "chiave pgp"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "se specificato, il messaggio verrà criptato usando questa chiave pubblica"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "se specificato, il messaggio verrà inviato usando questo account"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID del contatto"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Non ci sono account attivi"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Invia file ad un contatto"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Percorso file"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "se specificato, il file verrà inviato usando questo account"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Mostra tutte le preferenze ed i relativi valori"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Imposta il valore di 'chiave' a 'valore'."
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "chiave=valore"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'chiave' è il nome della preferenza, 'valore' è il valore a cui impostarla"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Elimina un oggetto dalle preferenze"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "chiave"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "nome della preferenza da eliminare"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Scrive lo stato corrente delle preferenze di Gajim nel file .config"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Elimina il contatto dalla lista"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Aggiunge il contatto alla lista"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Aggiunge un nuovo contatto a questo account"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Restituisce lo stato corrente (quello globale se non è specificato un "
 "account)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Restituisce il messaggio di stato corrente (quello globale se non è "
 "specificato un account)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Ci sono messaggi non letti"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Parametro mancante \"contact_jid\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1330,16 +1357,16 @@ msgstr ""
 "'%s' non appartiene alla lista contatti.\n"
 "Specificare l'account per l'invio del messaggio."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Non ci sono account attivi"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Versione D-Bus sconosciuta: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1348,16 +1375,16 @@ msgstr ""
 "Uso: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Parametri:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s non trovato"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1366,7 +1393,7 @@ msgstr ""
 "Uso: %s comando [parametri]\n"
 "Il comando è uno fra:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1375,32 +1402,32 @@ msgstr ""
 "Il parametro \"%s\" non è specificato. \n"
 "Scrivere\"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim ha bisogno di un server X per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim ha bisogno di PyGTK 2.6 o superiore"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr ""
 "Gajim ha bisogno di PyGTK 2.6 o superiore per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim ha bisogno di GTK2.6 o superiore"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim ha bisogno di GTK2.6 o superiore per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Supporto libglade mancante nel runtime GTK+"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1409,133 +1436,151 @@ msgstr ""
 "Eliminare il runtime GTK+ corrente ed installare l'ultima versione stabile "
 "da %s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Verificare che GTK+ e PyGTK abbiano supporto libglade sul sistema."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim ha bisogno di PySQLite2 per essere eseguito"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autorizzazione HTTP (%s) per %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Accettare questa richiesta?"
 
-#: ../src/gajim.py:498
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Contatto connesso"
+
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Contatto disconnesso"
+
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Nuovo messaggio privato"
+
+#: ../src/gajim.py:582
 #, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+msgid "%(nickname)s: %(message)s"
 msgstr ""
-"%(nickname)s nella stanza %(room_name)s ti ha inviato un  nuovo messaggio."
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s ti ha inviato un nuovo messaggio."
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nuovo messaggio singolo"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:610
+#, fuzzy, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nuovo messaggio come %s"
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "errore durante l'invio"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Autorizzazione accettata"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Il contatto \"%s\" ti ha autorizzato a vedere il suo stato."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Il contatto \"%s\" ha eliminato il tuo abbonamento verso di lui"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Lo vedrai sempre come offline."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non si può contattare \"%s\""
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Controllare la connessione o riprovare più tardi."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s è ora %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Passphrase errata"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Si è connessi senza la chiave OpenPGP"
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, fuzzy, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr "%(new_mail_gajim_ui_msg)s su %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1045
 #, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] "C'è %d nuova e-mail"
 msgstr[1] "Ci sono %d nuove e-mail"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr "%(new_mail_gajim_ui_msg)s su %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vuole inviarti un file."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Hai ricevuto con successo %(filename)s da %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Il trasferimento file di %(filename)s da %(name)s è fermo."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Hai inviato %(filename)s a %(name)s con successo."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Trasferimento file di %(filename)s a %(name)s fermato."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "La vCard è stata pubblicata correttamente"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Le informazioni personali sono state pubblicate con successo."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "Pubblicazione della vCard fallita"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1545,161 +1590,143 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#: ../src/gajim.py:1719
-msgid "GUI Migration failed"
-msgstr "Migrazione GUI fallita"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-"La migrazione dei log tramite l'interfaccia grafica è fallita. Il processo \n"
-"di migrazione partirà in background. Attendere qualche minuto per l'avvio \n"
-"di Gajim."
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "I log sono stati migrati con successo al database."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Supporto gestione sessioni non disponibile (modulo gnome.ui mancante)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Migrazione log..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Attendere durante la migrazione dei log..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Tema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "nome del tema"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Non è possibile eliminare il tema corrente"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Scegliere prima un altro tema."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Chat privata"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Chat privata"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Invio messaggio privato fallito"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, 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/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Chat di gruppo"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Chat di gruppo"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Questa stanza non ha oggetto"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato cacciato da %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bandito: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato bandito da %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s è ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s se ne è andato"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s è ora %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname non trovato: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Si è invitato %(contact_jid)s a %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s non sembra essere un JID valido"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "Comando inesistente: /%s (per inviarlo, scrivere /say prima di esso)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandi: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1712,7 +1739,7 @@ msgstr ""
 "\". Se il JID è correntemente nella stanza, verrà anche cacciato. NON "
 "supporta la presenza di spazi nel nickname."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1720,12 +1747,12 @@ msgstr ""
 "Uso: /%s <nickname>, apre una finestra di chat privata al partecipante "
 "specificato."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, pulisce la finestra di testo."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1734,12 +1761,12 @@ msgstr ""
 "Uso: /%s [motivo], chiude la finestra oi scheda corrente, mostrando il "
 "motivo se specificato."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Uso: /%s, imposta la modalità compatta nella finestra chat di gruppo"
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1748,7 +1775,7 @@ msgstr ""
 "Uso: /%s <JID> [motivo], invita JID alla stanza corrente, opzionalmente "
 "fornendo un motivo."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1757,7 +1784,7 @@ msgstr ""
 "Uso: /%s <stanza>@<server>[/nickname], offre la possibilità di entrare in "
 "stanza@server, opzionalmente usando il nickname specificato."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1768,7 +1795,7 @@ msgstr ""
 "nickname dalla stanza e opzionalmente mostra un motivo. NON supporta la "
 "presenza di spazi nel nickname."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1777,7 +1804,7 @@ msgstr ""
 "Uso: /%s <azione>, invia l'azione alla stanza corrente. Usare la terza "
 "persona (esempio: /%s esplode)."
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1786,90 +1813,90 @@ msgstr ""
 "Uso: /%s <nickname> [messaggio], apre una finestra di messaggi privati ed "
 "invia il messaggio al partecipante specificato per nickname."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Uso: /%s <nickname>, cambia il tuo nickname nella stanza corrente."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Uso: /%s [argomento], mostra o aggiorna l'argomento della stanza corrente."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Uso: /%s <messaggio>, invia un messaggio senza considerare gli altri comandi."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Non esiste aiuto per /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Si è sicuri di voler uscire dalla stanza \"%s\"?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Chiudendo questa finestra, si verrà disconnessi da questa stanza."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_Non chiedere più se chiudere \"%s\""
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Cambio oggetto"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Specificare il nuovo oggetto:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Cambio nickname"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Specificare il nuovo nickname da usare:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Segnalibro già impostato"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "La stanza \"%s\" è già tra i segnalibri."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Il segnalibro è stato aggiunto con successo"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "È possibile gestire i segnalibri attraverso il menu Azioni nella finestra "
 "della lista contatti."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bandendo %s"
@@ -1917,111 +1944,120 @@ msgstr "<b>Editor di configurazione avanzata</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Applicazioni</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Personalizzato</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Descrizione</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Formato di una linea</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Personalizzazione dell'interfaccia</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Traffico Jabber</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Varie</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informazioni personali</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Scegliere una delle seguenti opzioni:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Inserire i dati per il nuovo account</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Scegliere una delle seguenti opzioni:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Messaggi di stato predefiniti</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Proprietà</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Impostazioni</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Suoni</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Inserire il nuovo messaggio di stato:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notifiche visuali</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Cosa fare?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>Inserimento XML</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Un elenco dei trasferimenti di file attivi, completati ed annullati"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "_Account"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Dopo il nickname:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "A proposito"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Accetta"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Account"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2033,52 +2069,44 @@ msgstr ""
 "Contatto\n"
 "Banner"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Modifica account"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Account"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "Azioni av_anzate"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Aggiungi nuovo contatto"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Notifiche visuali</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Aggiungi _contatto"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Indirizzo"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Editor di configurazione avanzata"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Dopo il nickname:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Dopo l'ora:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2088,55 +2116,55 @@ msgstr ""
 "Solo composizione\n"
 "Disattivato"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Consentire invio di informazioni sull'_OS"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Permetti di vedere il mio stato"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "Consentire notifiche/popup quando _assente/nd/occupato/invisibile."
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "Conosciuto anche come stile iChat"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Chiedi messaggio di stato per:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Chiedi di poter vedere il suo stato"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Chiedi:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Assegna chiave Open_PGP"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorizza il contatto affinché sappia quando sei connesso"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "_Assente automaticamente dopo:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "N_on disponibile automaticamente dopo:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Partecipa automaticamente"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2148,15 +2176,15 @@ msgstr ""
 "Usa sempre le applicazioni predefinite di KDE\n"
 "Personalizza"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Autorizza automaticamente il contatto"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Riconnettiti automaticamente quando si perde la connessione"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2169,13 +2197,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Prima del nickname:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Prima dell'ora:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Prima del nickname:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2289,134 +2314,138 @@ msgid "Company:"
 msgstr "Società:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Configu_ra la stanza"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Collegati alla pressione di Fine"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Connessione"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Informazioni sul contatto"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "_Informazioni contatto"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "Cronologia conversazione"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "Paese:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "Icone _stato predefinite:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Elimina MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Elimina messaggio del giorno"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Elimina il messaggio del giorno"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Nega"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Nega l'autorizzazione al contatto; in questa maniera non saprà quando sei "
 "connesso"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Dipartimento:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Mostra gli avatar dei contatti nella lista"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Mostra i messaggi di stato dei contatti nella lista"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "Ogni _5 minuti"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Modifica gruppi"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Modifica informazioni personali..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Modifica _gruppi"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Emoticon:"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Abilita"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Inserire nuovamente per conferma:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Inserire nuova password:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Eventi"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "Ogni _5 minuti"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Indirizzo extra:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Cognome:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Trasferimenti file"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "_Trasferimenti file"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "File manager:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Filtro:"
@@ -2426,39 +2455,35 @@ msgid "Font style:"
 msgstr "Stile carattere:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Carattere:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Proibisci di vedere il mio stato"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-GG"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Domande frequenti (online)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "Da:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "_Vai"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Personalizzazione temi di Gajim"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2468,7 +2493,7 @@ msgstr ""
 "Gajim può ricevere ed inviare meta-informazioni relative ad una "
 "conversazione che con un contatto."
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2476,7 +2501,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:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2485,7 +2510,7 @@ msgstr ""
 "Gajim notificherà i nuovi messaggi tramite popup nell'angolo in fondo a "
 "destra dello schermo"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2493,7 +2518,7 @@ msgstr ""
 "Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
 "quando un contatto si connette"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2501,7 +2526,7 @@ msgstr ""
 "Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
 "quando un contatto si disconnette"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
@@ -2509,19 +2534,27 @@ msgstr ""
 "Gajim cambierà solamente l'icona del contatto che ha mandato il nuovo "
 "messaggio"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente creazione account"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Generale"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Nome:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Nessuno"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Gruppo:"
@@ -2569,18 +2602,24 @@ msgid "I would like to add you to my contact list."
 msgstr "Vorrei aggiungerti alla mia lista contatti."
 
 #: ../src/gtkgui.glade.h:170
-msgid "If checked, Gajim will also have a trayicon"
-msgstr "Se marcato, Gajim ha anche un'icona nell'area di notifica"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
+msgstr ""
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Se marcato, Gajim mostrerà il messaggio di stato di ogni membro della lista "
 "contatti sotto il suo nome"
@@ -2662,8 +2701,9 @@ msgstr ""
 "contatti come se ci fosse un unico account"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Messaggio in arrivo:"
+#, fuzzy
+msgid "Inactive"
+msgstr "Attivo"
 
 #. 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:185
@@ -2699,39 +2739,57 @@ msgid "Location"
 msgstr "Indirizzo"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Messaggio"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Gestisci..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Gestisci account"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Gestisci segnalibri"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Gestisci profili proxy"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Gestisci..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Secondo nome:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "Mo_deratore"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Ancora"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2743,108 +2801,104 @@ msgstr ""
 "Per account\n"
 "Per tipo"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Nickname:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Nessuno"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Notificare i contatti che eseguono:"
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr "Notifica le nuove e-mail su _Gmail"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "In _tutti i messaggi"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 msgid "One message _window:"
 msgstr "Una finestra messaggi:"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Apri..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Messaggio in uscita:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "In pausa"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Informazioni personali"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Telefono:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Riproduci _suoni"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Porta: "
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Titolo:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Codice postale:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Preferenze"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Prefisso:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "messaggio di stato"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Stampa ora:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Pr_iorità:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2854,60 +2908,52 @@ 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:237
-msgid "Profile, Avatar"
-msgstr "Profilo, avatar"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Protocollo:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Costruttore richieste..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Recentemente:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Registra a"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Rimuovi l'account solo da _Gajim"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Eliminare l'account da Gajim e dal _server"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Rimuovi trasferimento file dalla lista"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr ""
 "Rimuove dalla lista i trasferimenti di file completati, annullati e falliti"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Rispondi a questo  messaggio"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Reimposta ai colori di default"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "_Risorsa: "
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2921,167 +2967,159 @@ msgstr ""
 "contemporaneamente. La risorsa con la priorità maggiore riceverà gli eventi "
 "(vedi sotto)."
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Risorsa:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Ruolo:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Configurazione della stanza"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Salva _passphrase (non sicuro)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr "Salva _posizione e dimensione delle finestre di chat e lista contatti"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Salva file come..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Salva i _log delle conversazioni con tutti i contatti"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Salva pass_word"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 msgid "Search"
 msgstr "Cerca"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "_Invia"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Invia file"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Invia _messaggio singolo"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Invia _file"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Invia _nuovo messaggio..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Invia pacchetti di keep-alive"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Invia messaggio"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Invia messaggio e chiudi la finestra"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 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:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Servizi del server"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Imposta MOTD"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Imposta messaggio del giorno"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Imposta _avatar"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Imposta un avatar quando mi connetto"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Imposta messaggio del giorno"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Mostra tutti gli _eventi pendenti"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Mostra contatti _offline"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Mostra lista _contatti"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Mostra console _XML"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Mostra solo nella lista _contatti"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 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:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "C_onnessione"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "_Disconnessione"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Ordina i contatti per stato"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "Sta_to"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Avvia _chat"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Regione:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Stato"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Messaggio di stato:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Stato:"
@@ -3112,25 +3150,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "_Sincronizza lo stato dell'account con lo stato globale"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Tema:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "_Colore del testo:"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "Carattere del _testo:"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "Il messaggio di stato per l'assenza automatica"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "Il messaggio di stato per il 'non disponibile' automatico"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Tema:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3156,51 +3195,57 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr "URL:"
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Sottolinea"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "Aggiorna MOTD"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Aggiorna messaggio del giorno"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Aggiorna il messaggio del giorno"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Usa _SSL (legacy)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "Usa le icone dei _trasporti"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Usa autenticazione"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Usa hostname/port personalizzati"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "lista trasferimenti file"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Icona nell'area di notifica"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "ID utente:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Mostra una notifica popup quando un trasferimento file viene completato"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3213,21 +3258,21 @@ msgstr ""
 "ciò. NOTA: Gli eventi per i nuovi messaggi avverranno solo se si tratta di "
 "un nuovo messaggio da un contatto con cui non si sta già chattando"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Quando si riceve un nuovo evento"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Lavoro"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3235,416 +3280,456 @@ msgstr ""
 "È necessario avere un account per connettersi\n"
 "alla rete Jabber."
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Il tuo JID:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Azioni"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "_Aggiungi Contatto..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "_Aggiungi ai contatti"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Indirizzo:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Amministratore"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "_Avanzato"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Dopo l'ora:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Autorizza"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "_Sfondo:"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Bandisci"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Prima dell'ora:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "Inserire un _segnalibro per questa stanza"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "_Vista compatta    Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Contenuti"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "_Copia Indirizzo Email/JID"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Copia indirizzo collegamento"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Nega"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Ricerca servizi"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Ricerca servizi..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "File manager:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Fine"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Carattere:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "Chat di _gruppo"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "Evidenzia _parole scorrette"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_Cronologia"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "I_Q"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Icona nell'area di notifica"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignora gli eventi da contatti non appartenenti alla lista"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Messaggio in arrivo:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "_Entra in nuova stanza..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "_Caccia"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "_Memorizza cronologia conversazione"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "_Registra i cambiamenti di stato dei contatti"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "_Client mail:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "_Unisci account"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Messaggio"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Modifica"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "_Modifica account..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Nome: "
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Mai"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "_Notifica"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notifica quando un trasferimento file viene completato"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "Azioni _partecipanti"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "Utenti _online"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Apri composizione email"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Apri il collegamento nel browser"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Apri..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Messaggio in uscita:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "_Proprietario"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Riproduttore:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Mostra"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Preferenze"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Presenza"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Pubblica"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Elimina"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "_Elimina dai contatti"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Rispondi"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Reimposta ai colori di default"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Recupera"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Password:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Cerca"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "_Invia"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "_Invia e Chiudi"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "_Invia messaggio privato"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "_Invia messaggio server"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "_Invia messaggio singolo"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Ordina i contatti per stato"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "_Inizia chat"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Stato"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Messaggio di stato:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "A_bbonati"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Abbonamento"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Usa proxy"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "_Nome utente:"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Voce"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "Console _XML..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "lista trasferimenti file"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "minuti"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errore: impossibile aprire %s in lettura"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Errore leggendo il file:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Errore nel parsing del file:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 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à"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Cerca"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Elimina MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Cerca"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "creazione database log"
 
 #: ../src/history_manager.py:162
 #, fuzzy
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr "Migrare i log?"
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3653,36 +3738,36 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Migrazione log..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Data"
@@ -3716,74 +3801,80 @@ msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Messaggio"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Inizia chat con l'account %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 msgid "Observers"
 msgstr "Osservatori"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Sei già nella stanza %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Non è possibile unirsi ad una stanza quando si è invisibile"
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "_Entra in nuova stanza"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Gestione segnalibri..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "all'account %s"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "usando l'account %s"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "usando l'account %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Gestione segnalibri..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "per l'account %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_Cronologia"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "_Entra in nuova stanza"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3791,67 +3882,76 @@ msgstr ""
 "Non sarai in grado di mandare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Assegna chiave OpenPGP"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Seleziona una chiave da applicare al contatto"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr "Vorrei aggiungerti ai miei contatti"
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "Ri_nomina"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "_Connetti"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "_Disconnetti"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "_Cambia messaggio di stato"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "L'autorizzazione è stata inviata"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "La richiesta di abbonamento è stata inviata"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, 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:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "L'autorizzazione è stata rimossa"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come offline."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
+"vedrà sempre offline."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3859,37 +3959,37 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 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:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Passphrase richiesta"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, 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:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Memorizza passphrase"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Passphrase"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Stai partecipando ad una o più chat di gruppo"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3897,20 +3997,20 @@ msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste chat di "
 "gruppo. Diventare veramente invisibile?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 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:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Ci sono messaggi non letti"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3918,151 +4018,139 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata"
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Da %s nella stanza %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Invia file ad un contatto"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Cambia messaggio di stato..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Cambia messaggio di stato..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Nascondi questo menu"
 
-#: ../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"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %d messaggio non letto"
 msgstr[1] "Gajim - %d messaggi non letti"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - %d messaggio singolo non letto"
 msgstr[1] "Gajim - %d messaggi singoli non letti"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - %d messaggio in chat di gruppo non letto"
 msgstr[1] "Gajim - %d messaggi in chat di gruppo non letti"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - %d messaggio privato non letto"
 msgstr[1] "Gajim - %d messaggi privati non letti"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Ruolo: "
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Affiliazione: "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Stato: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Risorsa: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Stato: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Abbonamento: "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "Icone _stato predefinite:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Dimensione: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Tipo: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Scarica"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Invia"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Dimensione: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Tipo: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Trasferito: "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Non iniziato"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Fermato"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Completato"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "In pausa"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "In stallo"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Trasferimento in corso"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Questo servizio non ha ancora inviato informazioni dettagliate"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4070,33 +4158,33 @@ msgstr ""
 "Questo servizio non ha inviato informazioni dettagliate.\n"
 "È probabilmente vecchio o malfunzionante"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Scegli avatar"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Immagini"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Versione %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4104,7 +4192,7 @@ msgstr ""
 "Questo contatto è interessato alle informazioni sulla tua presenza, ma tu "
 "non sei interessato alla sua"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4112,14 +4200,14 @@ msgstr ""
 "Sei interessato alle informazioni sulla presenza di questo contatto, ma lui/"
 "lei non è interessato/a alla tua"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Tu ed il contatto siete reciprocamente interessati alle informazioni sulla "
 "presenza dell'altro"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4127,24 +4215,24 @@ msgstr ""
 "Non sei interessato alla presenza del contatto, e lui/lei non è interessato "
 "alla tua"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Sei in attesa della risposta del contatto alla tua richiesta di abbonamento"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr "Senza una connessione non è possibile pubblicare i dati personali."
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "Senza una connessione, non è possibile ottenere i dati personali."
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 msgid "Personal details"
 msgstr "Informazioni personali"
 
@@ -4190,45 +4278,47 @@ msgstr ""
 "mancante"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "Il bus della sessione non è disponibile"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Usa DBus e Notification-Daemon per mostrare le notifiche"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo in minuti dopo il quale lo stato diventa \"assente\"."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Assente per inattività"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo in minuti dopo il quale lo stato diventa \"non disponibile\"."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Non disponibile per inattività"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se Vero, non verranno rimossi */_. *abc* verrà mostrato in grassetto ma "
 "senza rimuovere * *."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Aggiungere * e [n] al titolo della lista contatti?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4236,12 +4326,12 @@ msgstr ""
 "Quante linee ricordare dalla precedente conversazione quando una scheda/"
 "finestra di chat viene riaperta."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Quanti minuti devono durare le ultime linee dalla conversazione precedente."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4249,20 +4339,20 @@ msgstr ""
 "Inviare il messaggio con Ctrl-Invio e con Invio creare una nuova linea "
 "(comportamento predefinito del client Mirabilis ICQ)."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Quante linee memorizzare per Ctrl+Alto."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Usa vista compatta quando si apre una finestra di chat"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Usa vista compatta quando si apre una finestra di chat di gruppo"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4271,30 +4361,30 @@ msgstr ""
 "URL personalizzato contenente %s dove %s è la parola/frase o 'WIKTIONARY', "
 "che significa usare wiktionary."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se marcato, Gajim può essere controllato da remoto usando gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Chiedere prima di chiudere una finestra/scheda di chat di gruppo."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Chiedere prima di chiudere una finestra/scheda di chat di gruppo."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Chiedere prima di chiudere una finestra/scheda di chat di gruppo."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4302,23 +4392,23 @@ msgstr ""
 "Imposta l'host inviato per il trasferimento file in caso di traduzione di "
 "indirizzo/port forwarding."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Secondo lo standard IEC, KiB = 1024 byte, KB = 1000 byte."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Mostrare scheda quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Mostrare bordo per le schede quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Mostrare il pulsante \"chiudi\" nelle schede?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4326,7 +4416,7 @@ msgstr ""
 "Una lista separata da caratteri ';' di parole che verranno evidenziate nelle "
 "chat multi-utente."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4335,11 +4425,11 @@ msgstr ""
 "cliccato. Questa impostazione è presa in considerazione solo se viene usata "
 "l'icona nello spazio di notifica."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Se Vero, Gajim si registra per xmpp:// ad ogni avvio."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4347,7 +4437,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà un icona su ogni scheda contenente messaggi non "
 "letti. A seconda del tema, questa icona può essere animata."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4355,7 +4445,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà il messaggio di stato, se non vuoto, per ogni "
 "contatto sotto il nome del contatto nella finestra dei contatti"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4364,7 +4454,7 @@ msgstr ""
 "l'ultima volta o ne ha uno troppo vecchio in cache."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4372,7 +4462,7 @@ 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:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4382,7 +4472,7 @@ msgstr ""
 "finestra lampeggia (comportamento predefinito per la maggior parte dei "
 "gestori di finestre) quando contiene nuovi eventi."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
@@ -4391,7 +4481,7 @@ msgstr ""
 "protetta da password. Impostare a Falso per smettere di inviare informazioni "
 "SHA nella presenza sulle chat di gruppo"
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4410,14 +4500,25 @@ msgstr ""
 "ad una specifica finestra. Nota, cambiare questa opzione richiede il riavvio "
 "di Gajim prima che le modifiche abbiano effetto"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr "Se Falso, l'avatar non verrà mostrato nella finestra di chat"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Dormo"
@@ -4486,182 +4587,98 @@ msgstr ""
 "Suono da riprodurre quando arriva un messaggio MUC (questa impostazione ha "
 "valore solo se notify_on_all_muc_messages è Vero)."
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "drogheria"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "umano"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "semplice"
-
-#: ../src/common/connection.py:68
-msgid "Unable to load idle module"
-msgstr "Impossibile caricare il modulo idle"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Non è possibile entrare nella stanza"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "È necessaria una password per entrare in questa stanza."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Sei bandito da questa stanza."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Questa stanza non esiste."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "Non è permessa la creazione di stanze."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "È necessario usare il nickname registrato."
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Non appartieni alla lista dei membri."
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Il nickname desiderato è in uso o registrato da un altro partecipante.\n"
-"Specificare un altro nickname sotto:"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-msgid "I would like to add you to my roster."
-msgstr "Vorrei aggiungerti ai miei contatti."
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "si è ora abbonati a %s"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "richiesta di cancellazione abbonamento da %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "è stato ora cancellato l'abbonamento a %s"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 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:1464
-#, 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 ""
-"Il JID %s non rispetta le RFC. Non verrà aggiunto ai contatti. Usare "
-"strumenti di gestione dei contatti come http://jru.jabberstudio.org/ per "
-"rimuoverlo"
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Password non valida"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Password non valida"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Non ci si è potuti collegare a \"%s\""
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Connesso al server %s:%s con %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Controllare la connessione o riprovare più tardi"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autenticazione con \"%s\" fallita"
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 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:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "Non è stata impostata la passphrase OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, 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:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "invisibile"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Sono %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4670,209 +4687,206 @@ msgstr ""
 "Oggetto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, 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:699
+msgid "I would like to add you to my roster."
+msgstr "Vorrei aggiungerti ai miei contatti."
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Carattere non valido nel nome utente."
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Indirizzo del server richiesto."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Carattere non valido nell'hostname."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Carattere non valido nella risorsa."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Occupato"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Occupato"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_Non disponibile"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Non disponibile"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "_Libero per chat"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Libero per chat"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "_Disponibile"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Disponibile"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "_Assente"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Assente"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "_Invisibile"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Invisibile"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "Ci sono errori"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "Nulla"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "Da"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Entrambi"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "Nulla"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Partecipanti"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Visitatori"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Visitatore"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "sta seguendo la conversazione"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "sta facendo altro"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "sta scrivendo..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "si è fermato mentre scriveva un messaggio"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "ha chiuso la finestra o scheda di chat"
 
@@ -4882,10 +4896,116 @@ msgstr "ha chiuso la finestra o scheda di chat"
 msgid "error: cannot open %s for reading"
 msgstr "errore: impossibile aprire %s per lettura"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "semplice"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "cyan"
 
+#~ msgid "Send"
+#~ msgstr "Invia"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr ""
+#~ "%(nickname)s nella stanza %(room_name)s ti ha inviato un  nuovo messaggio."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s ti ha inviato un nuovo messaggio."
+
+#~ msgid "GUI Migration failed"
+#~ msgstr "Migrazione GUI fallita"
+
+#~ msgid ""
+#~ "Logs migration through graphical interface failed. The migration process "
+#~ "will start in the background. Please wait a few minutes for Gajim to "
+#~ "start."
+#~ msgstr ""
+#~ "La migrazione dei log tramite l'interfaccia grafica è fallita. Il "
+#~ "processo \n"
+#~ "di migrazione partirà in background. Attendere qualche minuto per "
+#~ "l'avvio \n"
+#~ "di Gajim."
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "I log sono stati migrati con successo al database."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr "Se marcato, Gajim ha anche un'icona nell'area di notifica"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Profilo, avatar"
+
+#~ msgid "_Online Users"
+#~ msgstr "Utenti _online"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Inizia chat con l'account %s"
+
+#~ msgid "All contacts in this group are offline or have errors"
+#~ msgstr "Tutti i contatti in questo gruppo sono offline o hanno errori"
+
+#~ msgid "Size: "
+#~ msgstr "Dimensione: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "Il bus della sessione non è disponibile"
+
+#~ msgid "Unable to load idle module"
+#~ msgstr "Impossibile caricare il modulo idle"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Non è possibile entrare nella stanza"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "È necessaria una password per entrare in questa stanza."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Sei bandito da questa stanza."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Questa stanza non esiste."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "Non è permessa la creazione di stanze."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "È necessario usare il nickname registrato."
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Non appartieni alla lista dei membri."
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "Il nickname desiderato è in uso o registrato da un altro partecipante.\n"
+#~ "Specificare un altro nickname sotto:"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "si è ora abbonati a %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "richiesta di cancellazione abbonamento da %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "è stato ora cancellato l'abbonamento a %s"
+
+#~ 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 ""
+#~ "Il JID %s non rispetta le RFC. Non verrà aggiunto ai contatti. Usare "
+#~ "strumenti di gestione dei contatti come http://jru.jabberstudio.org/ per "
+#~ "rimuoverlo"
+
+#~ 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"
+
 #~ msgid "Sound"
 #~ msgstr "Suono"
 
@@ -5053,9 +5173,6 @@ msgstr "cyan"
 #~ msgid "with account "
 #~ msgstr "con l'account "
 
-#~ msgid "New Message as %s"
-#~ msgstr "Nuovo messaggio come %s"
-
 #~ msgid "No such command: /%s"
 #~ msgstr "Comando inesistente: /%s"
 
diff --git a/po/nb/LC_MESSAGES/gajim.po b/po/nb/LC_MESSAGES/gajim.po
index 0bc8ae773..55e7ab8e5 100644
--- a/po/nb/LC_MESSAGES/gajim.po
+++ b/po/nb/LC_MESSAGES/gajim.po
@@ -2,12 +2,12 @@
 # This file is distributed under the same license as the Gajim package.
 # Stian B. Barmen <stian@jabber.no>, 2005.
 #
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2005-12-08 14:28+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: \n"
@@ -51,7 +51,7 @@ msgid "Hidden"
 msgstr "Gjemt"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -68,62 +68,59 @@ msgstr ""
 "Utheving av feilstavede ord funksjonen vil ikke bli brukt."
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Samtale"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Samtale"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Kryptering"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s har ikke sendt en OpenPGP nøkkel og du har ikke tilegnet en"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Kryptering påslått"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Kryptering avslått"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "ikke i kontaktliste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -131,20 +128,20 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Hvert %s _minutt"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -192,199 +189,212 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "For å endre konto navnet må du ikke være tilkoblet."
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 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:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 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:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 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:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Kryptering"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 #, fuzzy
 msgid "Member List"
 msgstr "_Medlem"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 #, fuzzy
 msgid "Owner List"
 msgstr "_Eier"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 #, fuzzy
 msgid "Nick"
 msgstr "_Kast ut"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 #, fuzzy
 msgid "Role"
 msgstr "Rolle:"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 #, fuzzy
 msgid "Banning..."
 msgstr "Utvis %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Hva ønsker du å gjøre?</b>"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Hva ønsker du å gjøre?</b>"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Hva ønsker du å gjøre?</b>"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Hva ønsker du å gjøre?</b>"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -394,75 +404,85 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "Kontoen \"%s\" er tilkoblet til serveren"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Dersom du fjerner den vil tilkoblingen mistes."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Kontoen \"%s\" er tilkoblet til serveren"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Dersom du fjerner den vil tilkoblingen mistes."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Nytt Rom"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 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:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 msgid "You must enter a password for the new account."
 msgstr "Du må skrive inn et passord for den nye kontoen"
 
-#: ../src/config.py:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Ugyldig Jabber ID"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Kontakten er allerede listet  i din kontaktliste."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -471,19 +491,19 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Det skjedde en feil ved oppretting av kontoen"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
@@ -542,162 +562,161 @@ msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindinger mangler på denne maskinen"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Kontaktens navn: <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Transporter"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Forvalgt Status Melding</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Skriv inn din nye status melding:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Transporter"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abbnerings ønske for konto %s fra %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abbonerings ønske fra %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 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:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -706,157 +725,164 @@ msgstr ""
 "å sende en melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Tilbkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Ny Melding"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Ny Melding"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Fil Overførings Forespørsel"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Fil Overføring Feilet"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Fil Overføring Komplett"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Fil Overføring Stoppet"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 msgid "New E-mail"
 msgstr ""
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Fil Overførings Forespørsel"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Fil Overføring Feilet"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Fil Overføring Komplett"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Fil Overføring Stoppet"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "?Group Chat Contact Role:Ingen"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Enslig Melding med konto %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "XML Konsoll"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "Invitert %(contact_jid)s til %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester"
@@ -865,11 +891,11 @@ msgstr "Se etter Tjenester"
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -877,175 +903,176 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "bruker kontoen %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skanner %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Fil"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Lagret i: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Åpne Foreldre Katalog"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Fil overføring avbrutt"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "Tilkoblingen kan ikke opprettes."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Fil overføringen ble stoppet av kontakten på den andre siden"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Send"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "_Send"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim får ikke tilgang til filen"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Denne filen er i bruk av en annen prosess."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Hva ønsker du å gjøre?</b>"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Lagre Fil som..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Ønsker du å overskrive den?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1053,7 +1080,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
@@ -1070,12 +1097,12 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Avsender: "
 
@@ -1083,32 +1110,32 @@ msgstr "Avsender: "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Fortsett"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "vis hjelp for en spesifisert kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Aktiver nytt vindu med den neste uleste melingen"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1116,45 +1143,45 @@ msgstr ""
 "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
 "en egen linje"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Endrer status på konto eller kontoer"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "melding"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "status melding"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1162,19 +1189,19 @@ msgstr ""
 "endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
 "til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "om spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1184,113 +1211,113 @@ msgstr ""
 "konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten 'OpenPGP "
 "nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Viser alle instillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'nøkkel' er navnet på instillingen, 'verdi' er gjeldende instilling"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Sletter en instilling"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "nøkkel"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "navnet på instillingen som skal slettes"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver gjeldende Gajim instillinger til .config filen"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Legger til kontakt til kontaktlisten"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Legger til ny kontakt til denne kontoen."
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerer instillinger (globale instillinger om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
@@ -1298,16 +1325,16 @@ msgstr ""
 "Returnerer instillinger (globale instillinger om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1316,16 +1343,16 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Venligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Ukjent D-Bus versjon: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1334,16 +1361,16 @@ msgstr ""
 "Bruk: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1352,7 +1379,7 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1361,31 +1388,31 @@ msgstr ""
 "Argumenteet \"%s\" er ikke spesifisert. \n"
 "Skriv \"%s hjelp %s\" for mer informasjon"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim trenger en Xserver for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim trenger PyGTK 2.6 eller høyere"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim tenger PyGTK 2.6 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim trenger GTK 2.6 eller høyere"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim trenger GTK 2.6 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ mangler libglade støtte"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1394,133 +1421,152 @@ msgstr ""
 "Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
 "versjon fra %s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Vennligst sjekk at gtk og pygtk har libglade støtte på ditt system."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim trenger PySQLite2 for å kjøre"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autentisering for %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:498
-#, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "%(nickname)s i rom %(room_name)s har sendt deg en ny melding."
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Kontakt Logget På"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s har sendt deg en ny melding."
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Kontakt Logget Av"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Ny Privat Melding"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Ny Melding"
+
+#: ../src/gajim.py:610
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr ""
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "feil ved sending"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abbonementet fra deg"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Du vil alltid se han eller henne som frakoblet."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s er nå %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] "Du har uleste meldinger"
 msgstr[1] "Du har uleste meldinger"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har vellykket sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "vCard publisering vellykket"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Din personlige informasjon har blitt publisert uten feil."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1530,162 +1576,146 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine instillinger og valg"
 
-#: ../src/gajim.py:1719
-#, fuzzy
-msgid "GUI Migration failed"
-msgstr "vCard publisering feilet"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "Loggene ble migrert til databasen uten feil."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Migrerer Logger..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Vennligst vent mens loggene blir migrert..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Tema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "tema navn"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Du kan ikke slette ditt gjeldene tema"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Start Samtale"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Start Samtale"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, 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/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Gruppe Samtale"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Gruppe Samtale"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Dette rommet har ingen tittel"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt uønsket av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s er nå %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invitert %(contact_jid)s til %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ser ikke ut til å være en gyldig JID"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Ingen slik kommando: /%s (dersom du ønsker å sende likevel, så skriv /say "
 "før teksten)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1698,7 +1728,7 @@ msgstr ""
 "\". Skulle en bruker med den JIDen være tilstede i rommet vil denne også bli "
 "kastet ut. Det støttes ikke med mellomrom i kallenavnet."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1706,12 +1736,12 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu til den "
 "spesifiserte brukeren."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1720,12 +1750,12 @@ msgstr ""
 "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
 "dersom spesifisert."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Bruksanvisning: /%s, setter gruppesamtale vinduet til kompakt modus."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1734,7 +1764,7 @@ msgstr ""
 "Bruksanvisning: /%s <JID> [årsak], inviterer JID til gjeldende rom, og viser "
 "en årsak dersom spesifisert."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1743,7 +1773,7 @@ msgstr ""
 "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
 "gir mulighet for å spesifisere valgfritt kallenavn."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1754,7 +1784,7 @@ msgstr ""
 "kallenavn fra rommet og viser om spesifisert en årsak. Støtter ikke "
 "mellomrom i kallenavn."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1763,7 +1793,7 @@ msgstr ""
 "Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk "
 "tredje person. (f.eks. /%s eksploderer.)"
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1772,19 +1802,19 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn> [melding], åpner et privat meldingsvindu og "
 "sender meldingen til brukeren spesifisert av kallenavn."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr ""
 "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende rom."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Bruksanvisning: /%s [tittel], viser eller oppdaterer gjeldende rom tittel."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -1792,70 +1822,70 @@ msgstr ""
 "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
 "kommandoer."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjelpe informasjon for /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av rommet \"%s\"?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Dersom du lukker dette vinduet, så vil du bli koblet fra dette rommet."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "Rommet \"%s\" er allerede i dine bokmerker."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Utvis %s"
@@ -1903,111 +1933,120 @@ msgstr "<b>Editering av Avanserte Instillinger</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Applikasjoner</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Egendefinert</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Beskrivelse</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Utseende på en linje</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Grensenitt valg</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Trafikk</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diverse</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig Informasjon</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Vennligst velg ett av valgene under:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Vennligst fyll in data for din nye konto</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Vennligst velg ett av valgene under:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Forvalgt Status Melding</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Egenskaper</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Instillinger</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Lyder</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Skriv inn din nye status melding:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuelle Alarmer</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Hva ønsker du å gjøre?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Input</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "En liste over aktive, komplette og stoppede fil overføringer"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "K_ontoer"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Etter kallenavn:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "Om"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Godkjenn"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Konto"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2019,52 +2058,44 @@ msgstr ""
 "Kontakt\n"
 "Fane"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Konto Endring"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "Av_anserte Handlinger"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Legg til ny Kontakt"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Visuelle Alarmer</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Ny _Kontakt"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Avansert Konfigurasjons Editor"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Etter kallenavn:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Etter tid:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2074,56 +2105,56 @@ msgstr ""
 "Bare komponering \n"
 "Deaktivert"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Tillat _OS informasjon å bli sendt"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Tillat han/henne å se min status"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "Også kjent som iChat stil"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Forespør hans/hennes status"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Spør:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Tilegn Open_PGP Nøkkel"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Godkjenn kontakt så han kan vite når du er tilkoblet"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Auto _borte etter:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Auto _ikke tilgjengelig etter:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Auto bli med"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2135,15 +2166,15 @@ msgstr ""
 "Alltid bruk KDE standard applikasjoner\n"
 "Egendefinert"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Automatisk godkjenn kontakt"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Koble til på nytt automatisk når kontakten mistes"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2156,13 +2187,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Før kallenavn:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Før tid:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Før kallenavn:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2277,132 +2305,136 @@ msgid "Company:"
 msgstr "Bedrift:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Konfigurer _Rom"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Koble til når jeg klikker Ferdig"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Kontaktinformasjon"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "Kontakt_Info"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "Samtale Historikk"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "Land:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "Standard _status ikonsamling:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Slett MFD (MOTD)"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Slett Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Sletter Meling for Dagen"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Nekt"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr "Avslå godkjenning fra kontakt så han ikke kan se når du er tilkoblet"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Avdeling:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Viser kontaktikoner for kontakter i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Vis status melding for kontakter i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "E-Post:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "Hvert 5 _minutt"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Rediger Grupper"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Rediger Personlig Informasjon..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Behandle Uttrykksikoner"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Slå på"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Skriv inn en gang til for verifisering:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Skriv inn nytt passord:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "Hvert 5 _minutt"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Ekstra Adresse:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Etternavn:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Fil Overføringer"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "Fil _Overføringer"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Fil behandler:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Filter:"
@@ -2412,39 +2444,35 @@ msgid "Font style:"
 msgstr "Font stil:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Font:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Forby han/henne å se min status"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Ofte Stilte Spørsmål (online)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "Fra:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "G_å"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Gajim Tema Valg"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2454,7 +2482,7 @@ msgstr ""
 "Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha "
 "med en kontakt"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2462,7 +2490,7 @@ msgstr ""
 "Gajim vil autmatisk vise deg den nye meldingen i et samtalevindu eller fane "
 "i det eksisterende samtalevinduet"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2471,7 +2499,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:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2479,7 +2507,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:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2487,26 +2515,34 @@ 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:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajimvil bare endre ikonet til kontakten som har sendt den nye meldingen"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Opprettings Veiviser"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Generelle"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Fornavn:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Ingen"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Gruppe:"
@@ -2554,18 +2590,24 @@ msgid "I would like to add you to my contact list."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
 #: ../src/gtkgui.glade.h:170
-msgid "If checked, Gajim will also have a trayicon"
-msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
+msgstr ""
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
 "i kontaktliste vinduet."
@@ -2646,8 +2688,9 @@ msgstr ""
 "kontakter som om du hadde en konto"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Innkommende melding:"
+#, fuzzy
+msgid "Inactive"
+msgstr "Aktiv"
 
 #. 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:185
@@ -2683,39 +2726,57 @@ msgid "Location"
 msgstr "Plassering"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Melding"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Behandle..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Behandle Kontoer"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Behandle Bokmerker"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Behandle Proxy Profiler"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Behandle..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Mellomnavn:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "Mod_ererer"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Mer"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2723,109 +2784,105 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Alarmer meg om kontakter som:"
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "På hver _melding"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 #, fuzzy
 msgid "One message _window:"
 msgstr "Send melding og lukk vinduet"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Åpne..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Utgående melding:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Passord setning"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Pauset"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Personlig Informasjon"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Telefon Nummer:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Port:"
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Plassering:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Post Kode:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Tittel:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "status melding"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Utskrifts tid:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Priorit_et:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2835,59 +2892,51 @@ 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:237
-msgid "Profile, Avatar"
-msgstr "Profil, Bilde"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Spørrings Bygger..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Nylig:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Registrer til:"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Fjern kontoe _bare fra Gajim"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Fjern konto fra Gajim og fra _serveren"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Fjern filoverføringen fra listen"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr "Fjerner komplette, avbrutte og feilede filoverføringer fra listen"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Svar på denne meldingen"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Tilbakestill til Standard Farger"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "Ressu_rs:"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2901,168 +2950,160 @@ msgstr ""
 "navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få "
 "hendelsene. (se under)"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Ressurs:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Rolle:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Rom Instillinger"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Lagre _passord setning (usikkert)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr "Lagre _posisjon og størrelse for kontaktliste og samtalevinduer"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Lagre Fil som..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Lagre samtale _logger for alle kontakter"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Lagre pass_ord"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Search"
 msgstr "_Søk"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "Sen_d"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Send Fil"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Send _Melding"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Send _Fil"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Send _Ny Melding..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Send hold-i-live meldinger"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Send melding"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Send melding og lukk vinduet"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 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:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Server Funksjonalitet"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Velg MFD (MOTD)"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Velg Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Velg _Avatar"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Velg et ikonbilde (avatar) når jeg kobler til"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Setter Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Vis Alle _Handlinger som Venter"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Vis _Frakoblede Kontakter"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Vis _Kontaktliste"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Vis _XML Konsoll"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 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:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Sorter kontakter etter status"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Start _Samtale"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Fylke:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Status melding:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Status:"
@@ -3093,25 +3134,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Tema:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "Tekst _farge:"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "Tekst _font:"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "Den automatiserte borte meldinen"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "Den autmatiserte ikke tilgjengelig meldingen"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Tema:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3137,50 +3179,56 @@ msgid "Type:"
 msgstr "Skriv:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Strek Under"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "Oppdater MFD (MOTD)"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Oppdater Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Uppdaterer Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Bruk _SSL (gammel)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "Bruk _transportenes ikoner"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Bruk autentisering"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Bruk egendefinert maskinnavn/port"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "fil overførings liste"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Ikon i systemstatusfelt (også kjent som systray)"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Når en fil overføring er komplett vis en sprettopp informasjon"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3193,21 +3241,21 @@ msgstr ""
 "bare skje dersom du får en ny melding fra en kontakt du ikke er i samtale "
 "med."
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Når en ny hendelse blir motatt"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Jobb"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3215,414 +3263,453 @@ msgstr ""
 "Du trenger en konto før du kan koble\n"
 "til Jabber nettverket."
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Din JID:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Handlinger"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "_Legg til Kontakt..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "_Legg til Kontaktliste"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "_Avansert"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Etter tid:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Godkjenn"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "_Bakgrunn:"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Utvis"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Før tid:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "Lag _Bokmerke til Rommet"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "_Kompakt Utseende    Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "_Kopier JID/E-post Adresse"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Kopier Link PLassering"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Nekt"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Oppdag Tjenester..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Fil behandler:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Font:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "_Gruppe Samtale"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_Historie"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Ikon i systemstatusfelt (også kjent som systray)"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Innkommende melding:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "_Bli med i Nytt Rom"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "_Kast ut"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "_Slå sammen kontoer"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Endre"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "_Rediger Konto..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Navn:"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Aldri"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "_Gi meg beskjed om det"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Gi meg beskjed når filoverføring er komplett"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "_Beboer Handling"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "_Online Brukere"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Åpne ny Epost"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Åpne Link i Nettleser"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Åpne..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Utgående melding:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "_Eier"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Spiller:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Sprett opp"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Instillinger"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Publisér"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "_Fjern fra Kontaktliste"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Svar"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Tilbakestill til Standard Farger"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Hent"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Passord:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Søk"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "_Send"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "_Send & Lukk"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "_Send Privat Melding"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "_Send Server Melding"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "_Send Melding"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Sorter kontakter etter status"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Status melding:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Abbonér"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Abonement"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+msgid "_URL:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Bruk proxy"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "_Brukernavn:"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Stemme"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "_XML Konsoll..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "fil overførings liste"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "minutter"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Feil under traversering av fil:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Kunne ikke skrive til %s. Sesjons Håndterings støtte vil ikke virke."
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Søk"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Slett MFD (MOTD)"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Søk"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "lager logg database"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3631,36 +3718,36 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Migrerer Logger..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Dato"
@@ -3694,75 +3781,81 @@ msgstr "Status er nå: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Melding"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Start samtale med konto %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 #, fuzzy
 msgid "Observers"
 msgstr "Server"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Du er allerede i rom %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "_Bli med i Nytt Rom"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Behandle Bokmerker..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Behandle Bokmerker..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_Historie"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "_Bli med i Nytt Rom"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3770,69 +3863,78 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne "
 "transporten."
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "_Logg på"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "Logg _av"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "Abbonerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Dersom \"%s\" aksepterer denne forespørselen vil du få vite hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
+"at han eller henne alltid vil se deg som frakoblet."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3840,37 +3942,37 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
 "at han eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 msgid "I want this contact to know my status after removal"
 msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Skriv OpenPGP nøkkel passordsetning for konto %s"
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Lagre passordsetning"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Passord setning"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3878,19 +3980,19 @@ msgstr ""
 "Endring av status til usynlig vil resultere i at du forlater disse gruppe "
 "samtalene. Er du sikker på at du ønsker å bli usynlig?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 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:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3898,151 +4000,139 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått."
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Fra %s i rom %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Sender fil til en kontakt"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../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"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %d ulest melding"
 msgstr[1] "Gajim - %d uleste meldinger"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - %d ulest melding"
 msgstr[1] "Gajim - %d uleste meldinger"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - %d ulest melding"
 msgstr[1] "Gajim - %d uleste meldinger"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - %d ulest privat melding"
 msgstr[1] "Gajim - %d uleste private meldinger"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Rolle: "
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Tilhørighet: "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Status: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Abbonement: "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "Standard _status ikonsamling:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Størrelse: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Type: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Størrelse: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Type: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Pauset"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4050,33 +4140,33 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Velg Bilde"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Bilder"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Utforsking %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4084,7 +4174,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4092,13 +4182,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4106,23 +4196,23 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du venter på kontaktens svar på din abbonerings forespørsel"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr "Uten en tilkobling kan du ikke publisere din kontakt informasjon."
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "Uten en tilkobling kan du ikke hente din kontakt informasjon."
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 #, fuzzy
 msgid "Personal details"
 msgstr "Personlig Informasjon"
@@ -4167,45 +4257,47 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus finnes ikke på denne maskinen eller python modulen mangler"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "Sesjons buss ikke tilgjengelig"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Bruk DBus og Hendelses-Tjenesten for å vise hendelser"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minutter før status endres til borte."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Borte på grunn av inaktivitet"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minutter før status endres til ikke tilgjengelig."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Ikke tilgjengelig på grunn av inaktivitet"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Dersom True, ikke fjern */_ . Så *abc* vil bli uthevet men * * ikke vil bli "
 "fjernet."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Legg * og [n] inn i kontaktliste tittelen?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4213,12 +4305,12 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
 "blir åpnet på nytt."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4226,20 +4318,20 @@ msgstr ""
 "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
 "Klient standard oppførsel)."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Bruk kompakt utseende når du åpner et samtale vindu"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Bruk kompakt utseende når du åpner et gruppe samtale vindu"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4248,29 +4340,29 @@ msgstr ""
 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
 "'WIKTIONARY' som betyr bruk wiktionary."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4278,29 +4370,29 @@ msgstr ""
 "Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med "
 "adresse oversetting/port videresending."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare en samtale?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Vis fane felt ved bare en aktiv samtale?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtale."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4308,11 +4400,11 @@ msgstr ""
 "Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket "
 "på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Dersom True vil Gajim registreres for xmpp:// ved hver oppstart."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4320,7 +4412,7 @@ msgstr ""
 "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
 "meldinger. Avhengig av valgte tema kan dette ikonet være animert."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4328,7 +4420,7 @@ msgstr ""
 "Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
 "kontakt under kontaktens navn i kontaktliste vinduet."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4337,7 +4429,7 @@ msgstr ""
 "et ikonbilde sist gang eller har en lagret som er for gammel."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4345,20 +4437,20 @@ msgstr ""
 "Dersom False vil du ikke lenge kunne se status linjer i samtaler når en "
 "kontakt endrer hans eller hennes status og/eller status melding. "
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4369,14 +4461,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Sover"
@@ -4445,183 +4548,97 @@ msgstr ""
 "Lyd som spilles når en ny MUC melding kommer. (Denne instillingen er kun "
 "aktiv når notify_on_all_muc_messages er True)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "enkel"
-
-#: ../src/common/connection.py:68
-#, fuzzy
-msgid "Unable to load idle module"
-msgstr "Klarer ikke å gå inn i gruppesamtale"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Klarer ikke å gå inn i gruppesamtale"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "Et passord kreves for å bli med i dette samtalerommet."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Du er uønsket i dette rommet."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Et slikt rom finnes ikke."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "Rom oppretting er begrenset."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Ditt registrerte kallenavn må bli brukt. "
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Du er ikke medlems listen."
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Ditt ønskede kallenavn er i bruk eller er registrert av en annen "
-"samtalebruker.\n"
-"Vennligst skriv et annet kallenavn under:"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-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:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "vi abbonerer nå på %s"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "frakoblings ønske fra %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "vi abbonerer ikke lenger på %s"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 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:1464
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"Jid %s er ikke RFC kompatilbel. Den vil ikke bli lagt til kontaktlisten. "
-"Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ "
-"for å fjerne den"
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Ugyldig passord"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Ugyldig passord"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Tilkoblet til server %s:%s med %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 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:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passordsetning ble ikke gitt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, 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:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "usynlig"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Jeg er %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Denne meldingen er kryptert]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4630,207 +4647,206 @@ msgstr ""
 "Tittel: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
+msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brukernavn."
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Server adresse kreves."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i domene navn."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Borte"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "Fra"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Abbonér"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Modererere"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Modererer"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "skriver en melding..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
@@ -4840,10 +4856,106 @@ msgstr "har lukket samtalevinduet eller fanen"
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "enkel"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "turkis"
 
+#~ msgid "Send"
+#~ msgstr "Send"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr "%(nickname)s i rom %(room_name)s har sendt deg en ny melding."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s har sendt deg en ny melding."
+
+#, fuzzy
+#~ msgid "GUI Migration failed"
+#~ msgstr "vCard publisering feilet"
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "Loggene ble migrert til databasen uten feil."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Profil, Bilde"
+
+#~ msgid "_Online Users"
+#~ msgstr "_Online Brukere"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Start samtale med konto %s"
+
+#~ msgid "All contacts in this group are offline or have errors"
+#~ msgstr "Alle kontakter in denne gruppen er frakoblet eller har feil"
+
+#~ msgid "Size: "
+#~ msgstr "Størrelse: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "Sesjons buss ikke tilgjengelig"
+
+#, fuzzy
+#~ msgid "Unable to load idle module"
+#~ msgstr "Klarer ikke å gå inn i gruppesamtale"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Klarer ikke å gå inn i gruppesamtale"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Et passord kreves for å bli med i dette samtalerommet."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Du er uønsket i dette rommet."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Et slikt rom finnes ikke."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "Rom oppretting er begrenset."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Ditt registrerte kallenavn må bli brukt. "
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Du er ikke medlems listen."
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "Ditt ønskede kallenavn er i bruk eller er registrert av en annen "
+#~ "samtalebruker.\n"
+#~ "Vennligst skriv et annet kallenavn under:"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "vi abbonerer nå på %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "frakoblings ønske fra %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "vi abbonerer ikke lenger på %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "Jid %s er ikke RFC kompatilbel. Den vil ikke bli lagt til kontaktlisten. "
+#~ "Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio."
+#~ "org/ for å fjerne den"
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
+
 #~ msgid "Sound"
 #~ msgstr "Lyd"
 
diff --git a/po/nl/LC_MESSAGES/gajim.po b/po/nl/LC_MESSAGES/gajim.po
index c352399db..fda95ad89 100644
--- a/po/nl/LC_MESSAGES/gajim.po
+++ b/po/nl/LC_MESSAGES/gajim.po
@@ -5,12 +5,12 @@
 # Stéphan Kochen <stephan@kochen.nl>, 2005.
 # 
 # 
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2005-12-19 18:44+0100\n"
 "Last-Translator: Stéphan Kochen <stephan@kochen.nl>\n"
 "Language-Team: none\n"
@@ -56,7 +56,7 @@ msgid "Hidden"
 msgstr "Verborgen"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -73,63 +73,60 @@ msgstr ""
 "De markering van spelfouten zal niet worden gebruikt."
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 msgid "Your message can not be sent until you are connected."
 msgstr "Je bericht kan niet worden verzonden totdat je verbinding hebt."
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Gesprek"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Gesprek"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Versleuteling"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s heeft geen OpenPGP sleutel uitgezonden en je hebt er geen toegewezen"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Versleuteling ingeschakeld"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "niet in het rooster"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Je hebt zojuist een nieuw bericht ontvangen van \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -137,20 +134,20 @@ msgstr ""
 "Als je deze tab sluit en geschiedenis uitgeschakeld hebt zal dit bericht "
 "verlorgen gaan."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Elke %s _minuten"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Actief"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -198,203 +195,216 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Je bent momenteel verbonden met de server"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 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:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Ongeldige account naam"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Account naam kan niet leeg zijn."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Account naam mag geen spaties bevatten."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 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:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Account bestaat niet"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 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:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 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:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Kon de geheime sleutel niet ophalen"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 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:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Kies je OpenPGP sleutel"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Geen sleutel geselecteerd"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "Wijzig %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Registreer met %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 #, fuzzy
 msgid "Member List"
 msgstr "_Lid"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 #, fuzzy
 msgid "Owner List"
 msgstr "_Eigenaar"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 #, fuzzy
 msgid "Nick"
 msgstr "Uit_schoppen"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 #, fuzzy
 msgid "Role"
 msgstr "Rol:"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 #, fuzzy
 msgid "Banning..."
 msgstr "%s verbannen"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -404,77 +414,87 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "Account \"%s\" heeft verbinding met de server"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Als je het verwijdert, wordt de verbinding verbroken."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geef je wachtwoord op voor account %s"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Sla wachtwoord op"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Account \"%s\" heeft verbinding met de server"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Als je het verwijdert, wordt de verbinding verbroken."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Nieuwe Ruimte"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Deze bladwijzer bevat ongeldige informatie"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 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:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 msgid "You must enter a password for the new account."
 msgstr "Je moet een wachtwoord invullen voor de nieuwe account"
 
-#: ../src/config.py:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "De wachtwoorden in beide velden moeten identiek zijn"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Ongeldige Jabber ID"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Deze contact staat al op je rooster"
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "Account is met succes toegevoegd"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -482,19 +502,19 @@ msgstr ""
 "Je kunt geavanceerde accountopties instellen door op de Geavanceerd knop te "
 "drukken, of later via Accounts in het Bewerken menu van het hoofdvenster."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Er is een gout opgetreden bij het aanmaken van de account"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
 
@@ -554,165 +574,164 @@ msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python koppeling ontbreekt op deze computer"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus mogelijkheden van Gajim kunnen niet worden gebruikt"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Contactnaam: <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Transporten"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Groep"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "In de groep"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "SleutelID"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Contactnaam"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusbericht"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Statusbericht"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Typ je nieuwr statusbericht:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vul de informatie van de contactpersoon in die je aan account %s toe wilt "
 "voegen"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vul de informatie in van de contactpersoon die je toe wilt voegen"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Transporten"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "Ongeldige Gebruikers ID"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Deze contact staat al op je rooster"
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "Een GTK+ jabber client"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr "Stéphan Kochen <stephan@kochen.nl>"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abonnerings aanvraag voor account %s van %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnering aangevraagd van %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Het is niet mogelijk aan een groepsgesprek deel te nemen zonder verbonden te "
 "zijn."
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Neem deel aan Groepsgesprek met account %s"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -721,158 +740,165 @@ msgstr ""
 "worden:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Zorg ervoor dat je verbinding hebt met \"%s\"."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Je moet een wachtwoord opgeven."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Nieuw Bericht"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Nieuw Enkel Bericht"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Nieuw Privé Bericht"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Bestandsoverdracht Verzoek"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Bestandsoverdracht Fout"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Bestandsoverdracht Voltooid"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Bestandsoverdracht Gestopt"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 msgid "New E-mail"
 msgstr ""
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Bestandsoverdracht Verzoek"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Bestandsoverdracht Fout"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Bestandsoverdracht Voltooid"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Bestandsoverdracht Gestopt"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "?Group Chat Contact Role:Geen"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Enkel Bericht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Stuur %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schreef:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console voor %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "XML Console"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Kies Geluid"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Wav Geluiden"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Overigen"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Conferentie"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Zonder verbinding is het niet mogelijk te bladeren door aangebode services"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Ontdekking"
@@ -881,11 +907,11 @@ msgstr "Service Ontdekking"
 msgid "Service Discovery"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "De service kon niet worden gevonden"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -893,175 +919,176 @@ msgstr ""
 "Er bestaat geen service op het opgegeven adres, of de service geeft geen "
 "antwoord. Controleer het adres en probeer nogmaals."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "De service kan niet worden doorbladerd"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Dit soort service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "via account %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "Re_gistreer"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Binnengaan"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "Be_werken"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Onderzoeken %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Gebruikers"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Beschrijving"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Bestand"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Tijd"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Voortgang"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Bestandsnaam: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Grootte: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Jij"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Afzender: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Ontvanger: "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Opgeslagen in: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Bestandsoverdracht afgerond"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Open Bovenliggende Map"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Bestandsoverdracht geannuleerd"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "Kon geen verbinding maken met gebruiker."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Bestandsoverdracht gestopt door andere gebruiker"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Kies het Bestand om te Sturen"
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Verzend"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "Ver_stuur"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim heeft geen toegang tot dit bestand"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Dit bestand is in gebruik door een ander proces."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Dit bestands bestaat al"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Bestand: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s wil je een bestand sturen:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Sla Bestand op als..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Wil je het overschrijven?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1069,7 +1096,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
@@ -1086,12 +1113,12 @@ msgstr "Bestand: "
 msgid "It is not possible to send empty files"
 msgstr "Het is onmogelijk lege bestanden te sturen"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Naam: "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Afzender: "
 
@@ -1099,32 +1126,32 @@ msgstr "Afzender: "
 msgid "Pause"
 msgstr "Pauze"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Verder"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "laat hulp zien voor een specifiek commando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "commando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "laat hulp zien op commando"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Laat roostervenster zien of verbergt het"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Laat een venster opduiken met het volgende ongelezen bericht"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1132,43 +1159,43 @@ msgstr ""
 "Drukt een lijst af van contacten in het rooster. Elke contact komt op een "
 "aparte regel"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "geef alleen contacten weer van de gegeven account"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Drukt een lijst van geregistreerde accounts af"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Verander de status van de account of accounts"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "een van: offline, online, chat, away, xa, dnd, invisible"
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "bericht"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "statusbericht"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1177,23 +1204,23 @@ msgstr ""
 "status van alle accounts te veranderen die synchroniseren met de globale "
 "status"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Laat het gespreksvenster zien zodat je berichten kunt versturen aan een "
 "contact"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID van de contact waar je me in gesprek wilt gaan"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "Indien opgegeven zal contact van de contactlijst van deze account gehaald "
 "worden"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1203,117 +1230,117 @@ msgstr ""
 "sleutel als account zijn optioneel. Als je alleen 'account' wilt opgeven "
 "zonder 'OpenPGP sleutel', zet 'OpenPGP sleutel' dan op ''."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "inhoud bericht"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "pgp sleutel"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "indien opgegeven zal het bericht versleuteld worden met deze publieke sleutel"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "indien opgegeven zal het bericht verstuurd worden met deze account"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID van contact"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Stuurt een bestand aan contact"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "bestand"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Bestandspad"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "indien opgegeven zal bestand verstuurd worden met deze account"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Laat alle voorkeuren zien en hun waarden"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Zet waarde van 'sleutel' op 'waarde'."
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "sleutel=waarde"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'key' is de naam van de voorkeur, 'waarde' is de waarde die zal worden "
 "ingesteld"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Verwijdert een voorkeur onderdeel"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "sleutel"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "naam van de voorkeur die verwijderd zal worden"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Schrijft de huidige staat van de Gajim voorkeuren weg naar het .config "
 "bestand"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Voegt contact toe aan rooster"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Voegt een nieuwe contact toe aan deze account"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Retourneert huidige status (de globale status, tenzij een account is "
 "opgegeven)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
@@ -1321,16 +1348,16 @@ msgstr ""
 "Retourneert huidige status (de globale status, tenzij een account is "
 "opgegeven)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument \"contact_jid\" ontbreekt"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1339,16 +1366,16 @@ msgstr ""
 "'%s' staat niet op je rooster.\n"
 "Geef een account op om het bericht mee te sturen."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Onbekende D-Bus versie: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1357,16 +1384,16 @@ msgstr ""
 "Gebruik: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Argumenten:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s niet gevonden"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1375,7 +1402,7 @@ msgstr ""
 "Gebruik: %s commando [argumenten]\n"
 "Commando is een van:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1384,31 +1411,31 @@ msgstr ""
 "Argument \"%s\" is niet gespecificeerd. \n"
 "Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim vereist een Xserver en zal nu stoppen..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim vereist PyGTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim vereist PyGTK 2.6 of nieuwer en zal nu stoppen..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim vereist GTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim vereist GTK 2.6 of nieuwer en zal nu stoppen..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Libglade ondersteuning ontbreekt in de GTK+ runtime"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1416,135 +1443,153 @@ msgid ""
 msgstr ""
 "Verwijder je GTK+ runtime en installeer de laatste stabiele versie van %s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Controleer of gtk en pygtk ondersteuning hebben voor libglade op je systeem."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim vereist PySQLite2"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Machtiging voor %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Neem je dit verzoek aan?"
 
-#: ../src/gajim.py:498
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Contact is Ingelogd"
+
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Contact is Uitgelogd"
+
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Nieuw Privé Bericht"
+
+#: ../src/gajim.py:582
 #, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+msgid "%(nickname)s: %(message)s"
 msgstr ""
-"%(nickname)s in ruimte %(room_name)s heeft je een nieuw bericht gestuurd."
 
-#: ../src/gajim.py:553
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nieuw Enkel Bericht"
+
+#: ../src/gajim.py:610
 #, python-format
-msgid "%s has sent you a new message."
-msgstr "%s heeft je een nieuw bericht gestuurd."
+msgid "New Message from %(nickname)s"
+msgstr ""
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "fout tijdens versturen"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Machtiging geaccepteerd"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Contact \"%s\" heeft je toestemming gegeven zijn status te zien."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" heeft het abonnement op jou opgezegd"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Je zult hem altijd als offline zien."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kan geen contact maken met \"%s\""
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Controleer de verbinding of probeer later nogmaals."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s is nu %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Je wachtwoord is incorrect"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] "Je hebt ongelezen berichten"
 msgstr[1] "Je hebt ongelezen berichten"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wil je een bestand sturen."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Je hebt %(filename)s met succes van %(name)s ontvangen."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s van %(name)s gestopt."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Je hebt %(filename)s met succes aan %(name)s gestuurd."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s aan %(name)s gestopt."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "vCard publicatie is met succes afgerond"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Je persoonlijke informatie is met succes gepubliceerd."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1554,161 +1599,145 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
-#: ../src/gajim.py:1719
-#, fuzzy
-msgid "GUI Migration failed"
-msgstr "vCard publicatie is mislukt"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "Logboeken zijn met succes omgezet naar de database."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sessiebeheer ondersteuning is niet beschikbaar (gnome.ui module ontbreekt)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Logboeken worden omgezet..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Thema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "thema naam"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Je kunt je huidige thema niet verwijderen"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Kies eerst een ander thema."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Start Gesprek"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Start Gesprek"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Sturen van privé bericht mislukt"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, 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/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Groupsgesprek"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Deze ruimte heeft geen onderwerp"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt door %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen door %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s is nu bekend als %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s heeft de ruimte verlaten"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s is nu %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s blijkt geen geldige JID te zijn"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Onbekend commando: /%s (als je deze tekst wil sturen, begin dan met /say)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Commando's: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1721,7 +1750,7 @@ msgstr ""
 "\" bevat. Als de JID zich momenteel in de ruimte bevindt, zal hij eruit "
 "geschopt worden. Ondersteunt GEEN spaties in de bijnaam."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1729,12 +1758,12 @@ msgstr ""
 "Gebruik: /%s <bijnaam>, opent een privé gespreksvenster met de opgegeven "
 "gebruiker."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Gebruik: /%s, leegt het tekst venster."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1743,12 +1772,12 @@ msgstr ""
 "Gebruik: /%s [reden], sluit de huidige tab of venster, en laat reden achter "
 "indien opgegeven."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Gebruik: /%s, zet het groepsgespreksvenster op compacte modus."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1757,7 +1786,7 @@ msgstr ""
 "Gebruik: /%s <JID> [reden], nodigt JID uit de huidige ruimte binnen te "
 "komen, met optioneel de opgegeven reden."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1766,7 +1795,7 @@ msgstr ""
 "Gebruik: /%s <ruimte>@<server>[/bijnaam], biedt aan ruimte@server binnen te "
 "gaan, optioneel met de opgegeven bijnaam."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1777,7 +1806,7 @@ msgstr ""
 "bijnaam van de ruimte, optioneel met de opgegeven reden. Ondersteunt GEEN "
 "spaties in de bijnaam."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1786,7 +1815,7 @@ msgstr ""
 "Gebruik: /%s <actie>, stuurt actie naar de huidige ruimte. Hij-vorm "
 "gebruiken. (bijv. /%s loopt...)"
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1795,90 +1824,90 @@ msgstr ""
 "Gebruik: /%s <bijnaam> [bericht], opent een privé gespreksvenster en stuurt "
 "bericht naar de gebruiker met de opgegeven bijnaam."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Gebruik: /%s <bijnaam>, verandert je bijnaam in de huidige ruimte."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
 "onderwerp bij naar de opgegeven tekst."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Gebruik: /%s <bericht>, stuurt een bericht zonder naar commando's te zoeken."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Geen hulp beschikbaar voor /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Weet je zeker dat je de ruimte \"%s\" wilt verlaten?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr ""
 "Als je dit venster sluit zal de verbinding verbroken worden met deze ruimte."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "Vraag mij dit niet nogmaals"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Onderwerp Veranderen"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Geef het nieuwe onderwerp op:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Bijnaam Veranderen"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Bladwijzer bestaat al"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "Ruimte \"%s\" heeft al een bladwijzer."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Bladwijzer is met succes toegevoegd"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Je kunt bladwijzers beheren via het Acties menu in je rooster."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Je kunt hieronder een reden opgeven:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -1926,111 +1955,120 @@ msgstr "<b>Geavanceerde Instellingen Wijzigen</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Toepassingen</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Aangepast</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Beschrijving</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Interface Aanpassingen</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Verkeer</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Overige</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persoonlijke Informatie</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Kies een van de volgende opties:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Vul de informatie in voor je nieuwe account</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Kies een van de volgende opties:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Eigenschappen</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Instellingen</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Geluiden</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Typ je nieuwr statusbericht:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuele Meldingen</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Invoer</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Een lijst van actieve, afgeronde en gestopte bestandsoverdrachten"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "A_ccounts"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Na bijnaam:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "Info"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Accepteer"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Account"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2042,52 +2080,44 @@ msgstr ""
 "Contact\n"
 "Vaandel"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Account Wijziging"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "Gea_vanceerde Acties"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Nieuwe Contact Toevoegen"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Visuele Meldingen</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "_Contact Toevoegen"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Adres"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Geavanceerde Configuratie Wijzigen"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Na bijnaam:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Na tijdsstempel:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2097,60 +2127,60 @@ msgstr ""
 "Alleen bij typen van bericht\n"
 "Uitgeschakeld"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Sta toe informatie over _besturingssysteem te verzenden"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Sta hem/haar toe mijn status te zien"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Laat popups/mededelingen zien als ik _afwezig/niet beschikbaar/bezig/"
 "onzichtbaar ben"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "Ook bekend als iChat-stijl"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Vraag om status bericht als ik:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Vraag:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Wijs Open_PGP Sleutel toe"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr ""
 "Geef contact toestemming mijn status op te halen, zodat hij weet wanneer ik "
 "online ben"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Automatisch _afwezig na:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Automatisch _niet beschikbaar na:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Automatisch binnengaan"
 
 # deelnemen?
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2162,15 +2192,15 @@ msgstr ""
 "Gebruik altijd standaard KDE toepassingen\n"
 "Aangepast"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Automatisch contacten toestemming geven"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Automatisch verbinding herstellen als deze verbroken wordt"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2183,13 +2213,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Voor bijnaam:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Voor tijdsstempel:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Voor bijnaam:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2305,132 +2332,136 @@ msgid "Company:"
 msgstr "Bedrijf:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Configureer _Ruimte"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Verbind zodra ik Afronden druk"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Verbinding"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Contact Informatie"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "Contact _Info"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "Gespreksgeschiedenis"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "Land:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "Standaard _status iconenset:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Wis MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Wis het Bericht van de Dag"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Zal het Bericht van de Dag wissen"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Weigeren"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr "Geef contact geen toestemming om te zien of je online bent"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Afdeling:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Statusberichten van contacten weergeven in het rooster"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "Elke 5 _minuten"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Wijzig Groepen"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Wijzig Persoonlijke Informatie..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Wijzig _Groepen"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Beheer Emoticons"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Geef opnieuw op ter bevestiging:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Geef nieuw wachtwoord op:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Gebeurtenissen"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "Elke 5 _minuten"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Extra Adres:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Familie:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Bestandsoverdrachten"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "Bestands_overdrachten"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Bestandsbeheerder:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Filter:"
@@ -2440,39 +2471,35 @@ msgid "Font style:"
 msgstr "Letterstijl:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Lettertype:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Verbiedt hem/haar mijn status te zien"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Formaat: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Veel Gestelde Vragen (online)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "Van:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "Ga"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Gajim Themas Aanpassen"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2480,7 +2507,7 @@ msgid ""
 "send to the other party."
 msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2488,7 +2515,7 @@ msgstr ""
 "Gajim zal automatisch nieuwe berichten in een nieuw venster of tab in een "
 "bestaand venster laten zien"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2496,7 +2523,7 @@ msgid ""
 msgstr ""
 "Gajim zal nieuwe berichten mededelen m.b.v. een popup rechtsonder in beeld"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2504,7 +2531,7 @@ msgstr ""
 "Gajim zal contacten die zich aanmelden mededelen m.b.v. een popup "
 "rechtsonder in beeld"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2512,25 +2539,33 @@ msgstr ""
 "Gajim zal contacten die zich afmelden mededelen m.b.v. een popup rechtsonder "
 "in beeld"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim zal alleen het contacticoon veranderen bij nieuwe berichten"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Wizard Account Aanmaken"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Algemeen"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Voornaam:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Geen"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Groep:"
@@ -2578,21 +2613,25 @@ msgid "I would like to add you to my contact list."
 msgstr "Ik wil je graag toevoegen aan mijn contactlijst"
 
 #: ../src/gtkgui.glade.h:170
-msgid "If checked, Gajim will also have a trayicon"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
 msgstr ""
-"Indien aangevinkt zal Gajim een icoon in het mededelingengebied (systray) "
-"weergeven"
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Indien aangevinkt zal Gajim statusberichten van contacten onder de "
 "contactnaam in het roostervenster laten zien."
@@ -2677,8 +2716,9 @@ msgstr ""
 "van alle accounts samenvoegen alsof ze een grote account zijn."
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Binnenkomend bericht:"
+#, fuzzy
+msgid "Inactive"
+msgstr "Actief"
 
 #. 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:185
@@ -2714,39 +2754,57 @@ msgid "Location"
 msgstr "Locatie"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "_Bericht"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Beheer..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Beheer Accounts"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Beheer Bladwijzers"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Beheer Proxy Profielen"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Beheer..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Middelste naam:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "_Beheerder"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Meer"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Naam:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2754,109 +2812,105 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Bijnaam:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Geen"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Geef mij bericht over contacten die: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "Besturingssysteem:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "Bij elk _bericht"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 #, fuzzy
 msgid "One message _window:"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Open..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Uitgaand bericht:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "_Wachtwoord:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Wachtwoord"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Gepauzeerd"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Persoonlijke Informatie"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Telefoonnummer:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Speel _geluiden af"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Poort: "
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Positie:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Postcode:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Voorkeuren"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Voorvoegsel:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "statusbericht"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Print tijd:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Priori_teit"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2866,61 +2920,53 @@ msgstr ""
 "ontvangt als er twee keer op dezelfde account ingelogd is; de hoogste  "
 "prioriteit wint."
 
-#: ../src/gtkgui.glade.h:237
-msgid "Profile, Avatar"
-msgstr "Profiel, Contactafbeelding"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Query Bouwer..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Recent:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Registreer naar"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Verwijder account alleen van Gajim"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Verwijder account van Gajim en van de server"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Verwijder bestandsoverdracht van de lijst."
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr ""
 "Verwijdert afgeronde, geannuleerde en mislukte bestandsoverdrachten van de "
 "lijst"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Beantwoord dit bericht"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Herstel naar Standaard Kleuren"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "_Bron: "
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2933,168 +2979,160 @@ msgstr ""
 "met zowel met een bron 'Thuis' als een bron 'Werk' ingelogd te zijn. De "
 "prioriteit bepaald dan wie berichten ontvangt. (zie hieronder)"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Bron:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Rol:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Ruimte Configuratie"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Ruimte:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Sla _wachtwoord op (onveilig)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr "Sla _positie en grootte op voor rooster- en gespreksvensters"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Sla Bestand op als..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Sla gespreks_logboek op voor alle contacten"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Sla _wachtwoord op"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Search"
 msgstr "_Zoek"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "Verzen_d"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Bestand Verzenden"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Enkel _Bericht Verzenden"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "_Bestand Verzenden"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Stuur _Nieuw Bericht..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Keep-alive-pakketten verzenden"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Bericht verzenden"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 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:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Server Mogelijkheden"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Stel MOTD in"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Stel Bericht van de Dag in"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Stel Contact_afbeelding in"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Stel een contactafbeelding in zodra ik verbinding maak"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Stelt het Bericht van de Dag in"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Laat Alle Wachtende Gebeurtenissen Zien"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "_Offline Contacten Weergeven"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "_Rooster Weergeven"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "_XML Console Weergeven"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 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:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "_Inloggen"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "_Uitloggen"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Sorteer contacten op status"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Start _Gesprek"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Staat:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Status bericht:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Status:"
@@ -3125,25 +3163,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Synch_roniseer account status met globale status"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Thema:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "Tekst_kleur"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "Letter_type"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "Het statusbericht voor automatische afwezigheid"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "Het statusbericht voor automatisch niet beschikbaar"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Thema:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3169,50 +3208,56 @@ msgid "Type:"
 msgstr "Type:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Onderstreept"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "MOTD Bijwerken"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Bericht van de Dag Bijwerken"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Werkt Bericht van de Dag bij"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Gebruik _SSL (verouderd)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "Gebruik _transport iconensets"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Gebruik aanmelding"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Gebruik aangepaste hostnaam/poort"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "bestandsoverdrachtlijst"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Icoon in mededelingsgebied"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "Gebruikers ID:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Laat een popup zien als een bestandsoverdracht voltooid is"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3225,21 +3270,21 @@ msgstr ""
 "Nieuwe bericht-gebeurtenissen treden alleen op als het een nieuw bericht is "
 "van een contact waar je nog geen gesprek mee hebt"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Werk"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3247,415 +3292,454 @@ msgstr ""
 "Je hebt een account nodig om verbinding te maken\n"
 "met het Jabber netwerk."
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Jouw JID:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Acties"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "_Contact Toevoegen..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "_Toevoegen aan Roster"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "Gea_vanceerd"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Na tijdsstempel:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Toestemmen"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "_Achtergrond:"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "Ver_bannen"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Voor tijdsstempel:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "Maak _Bladwijzer Voor Deze Ruimte"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Annulerem"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "_Compacte Weergave    Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Inhoud"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "_Kopieer JID/Email Adres"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Kopieer Link Lokatie"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Weigeren"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "Ontdek Services"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "Ontdek Services..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Bestandsbeheerder:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Afronden"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Lettertype:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "_Groupsgesprek"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "Verkeerd gespelde woorden _markeren"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_Geschiedenis"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Icoon in mededelingsgebied"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Binnenkomend bericht:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "Nieuwe Ruimte Binnengaan..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "Uit_schoppen"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "Gespreksgeschiedenis"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "Houdt status veranderingen van contacten bij in het logboek"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "_Mail client:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Lid"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "Accounts _samenvoegen"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Bericht"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "Be_werk"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "Account Be_werken..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Naam: "
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Nooit"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "_Stel mij ervan op de hoogte"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Stel mij op de hoogte als een bestandsoverdracht voltooid is"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "_Gebruiker Acties"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "_Online Gebruikers"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Open Email Samensteller"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Open..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Uitgaand bericht:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "_Eigenaar"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Pauze"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Speler:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Opduiken"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Poort:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Voorkeuren"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Aanwezigheid"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Publiceren"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "A_fsluiten"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Verwijder"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "_Verwijder van Rooster"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "_Hernoem"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "Be_antwoord"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Herstel naar Standaard Kleuren"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Haal op"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Wachtwoord:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Zoek"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "Ver_stuur"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "Ver_stuur & Sluit"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "Ver_stuur Privé Bericht"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "Ver_stuur Server Bericht"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "Ver_stuur Enkel Bericht"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Sorteer contacten op status"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "_Start Gesprek"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Status bericht:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Abonneer"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Abonnement"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+msgid "_URL:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Gebruik proxy"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "_Gebruikersnaam:"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Stem"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "_XML Console..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "bestandsoverdrachtlijst"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "minuten"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fout: kan %s niet voor lezen openen"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Fout bij verwerken bestand:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Kan niet naar %s schrijven. Sessiebeheer ondersteuning werkt mogelijk niet"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Zoek"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Wis MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Zoek"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "logboek database wordt aangemaakt"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3664,36 +3748,36 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Logboeken worden omgezet..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Datum:"
@@ -3727,75 +3811,81 @@ msgstr "Status is nu: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status is nu: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "_Bericht"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Start Gesprek met account %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Samengevoegde accounts"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 #, fuzzy
 msgid "Observers"
 msgstr "Server"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Je kunt een ruimte niet binnengaan terwijl je onzichtbaar bent"
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "Nieuwe Ruimte _Binnengaan"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Beheer Bladwijzers..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "aan %s account"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "via %s account"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "via account %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Beheer Bladwijzers..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_Geschiedenis"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "Nieuwe Ruimte _Binnengaan"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3803,67 +3893,76 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Wijs een OpenPGP sleutel toe"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Selecteer een sleutel om aan de contact toe te wijzen"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 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:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "Her_noem"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "_Log in"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "Log _uit"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "_Wijzig Statusbericht"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "Machtiging is verzonden"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" zal nu je status ontvangen."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, 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:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" zal je nu altijd als offline zien."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Door deze contact te verwijderen zal je ook zijn toestemming opzeggen om jou "
+"status te zien. Hij/Zij zal jou altijd als offline zien."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3871,37 +3970,37 @@ msgstr ""
 "Door deze contact te verwijderen zal je ook zijn toestemming opzeggen om jou "
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 msgid "I want this contact to know my status after removal"
 msgstr "Ik wil dat deze contact mijn status blijf zien na verwijdering"
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, 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:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Sla wachtwoord op"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Wachtwoord"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Je neem deel aan een of meerdere groepsgesprekken"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3910,21 +4009,21 @@ msgstr ""
 "groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
 "wilt gaan?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 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:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3932,151 +4031,139 @@ msgstr ""
 "Berichten zullen alleen voor later beschikbaar zijn als de geschiedenis "
 "ingeschakeld is."
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Van %s in ruimte %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Stuurt een bestand aan contact"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Wijzig Statusbericht..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Wijzig Statusbericht..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Verberg dit menu"
 
-#: ../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"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - één ongelezen bericht"
 msgstr[1] "Gajim - %d ongelezen berichten"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - één los ongelezen bericht"
 msgstr[1] "Gajim - %d ongelezen losse berichten"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - één ongelezen groepgesprek bericht"
 msgstr[1] "Gajim - %d ongelezen groepgesprek berichten"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - één ongelezen privé bericht"
 msgstr[1] "Gajim - %d ongelezen privé berichten"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Rol: "
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Aansluiting: "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Status: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Bron: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "Standaard _status iconenset:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Grootte: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Type: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Grootte: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Type: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Verzonden: "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Niet gestart"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Afgerond"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Gepauzeerd"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Vastgelopen"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Verzenden"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Deze service heeft nog niet geantwoord met gedetaileerde informatie"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4084,33 +4171,33 @@ msgstr ""
 "Deze service kon niet antwoorde met gedetaileerde informatie.\n"
 "Het is waarschijnlijk veroudert of kapot"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Kies een Contactafbeelding"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Afbeeldingen"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "?Client:Onbekend"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "?OS:Onbekend"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4118,7 +4205,7 @@ msgstr ""
 "Deze contact is geïnteresseert in jou aanwezigheid, maar jij niet in zijn/"
 "haar aanwezigheid"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4126,38 +4213,38 @@ msgstr ""
 "Je bent geïnteresseert in de contact z'n aanwezigheid, maar hij/zij niet in "
 "jouw aanwezigheid"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Jij en de contact zijn beide geïnteresseert in elkaars aanwezigheid"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Jij en de contact zijn beide niet geïnteresseert in elkaars aanwezigheid"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Je bent aan het wachten op bevestiging van jou op abonnement op deze contact"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " bron met prioriteit"
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Het is niet mogelijk je contact informatie te publiceren zonder verbinding."
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 "Het is niet mogelijk je contact informatie op te halen zonder verbinding."
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 #, fuzzy
 msgid "Personal details"
 msgstr "Persoonlijke Informatie"
@@ -4201,46 +4288,48 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus bevindt zich niet op deze machine of de python module ontbreekt"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "Sessiebus is niet beschikbaar"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Gebruik DBus en Notification-Daemon om notificaties weer te geven"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tijd in minuten waarna je statusbericht op afwezig ingesteld wordt"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Afwezig vanwege inactiviteit"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Tijd in minuten waarna je statusbericht op niet beschikbaar ingesteld wordt."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Niet beschikbaar vanwege inactiviteit"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Indien Aan, verwijder niet */_ . Zodat *abc* vetgedrukt wordt, maar zonder "
 "dat * * verwijdert wordt."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Voeg * en [n] toe aan roster titel?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4248,12 +4337,12 @@ msgstr ""
 "Hoeveel regels te onthouden van het vorige gesprek zodra een gesprekstab of -"
 "venster heropend wordt."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hoeveel minuten zouden regels van het vorige gesprek onthouden moeten worden."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4261,20 +4350,20 @@ msgstr ""
 "Stuur bericht na Ctrl+Enter en slechts Enter maakt een nieuwe regel "
 "(Standaard gedrag van Mirabilis ICQ)."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hoeveel regels op te slaan voor Ctrl+Omhoog"
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Gebruik compacte weergave bij gespreksvensters"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Gebruik compacte weergave bij groepsgespreksvensters"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4283,16 +4372,16 @@ msgstr ""
 "Óf een aangepaste url met %s erin verwerkt, waar %s is een woord/zin, óf "
 "'WIKTIONARY' wat betekent dat wiktionary gebruikt zal worden."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Indien aangevinkt zal Gajim bestuurd kunnen worden met gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
@@ -4300,7 +4389,7 @@ msgid ""
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
@@ -4308,7 +4397,7 @@ msgid ""
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4316,23 +4405,23 @@ msgstr ""
 "Forceert de host die opgegeven wordt voor bestandsoverdrachten in het geval "
 "van een NAT of port forwarding."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Volgens de IEC standaard is 1 KiB = 1024 bytes, 1 KB = 1000 bytes."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Laat tabs zien bij slechts één gesprek?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Laat tab rand zien bij slechts één gesprek?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Laat sluit knop zien in tabs?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4340,7 +4429,7 @@ msgstr ""
 "Een puntkomma-onderbroken lijst van woorden die oplichten in een "
 "groepsgesprek"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4348,11 +4437,11 @@ msgstr ""
 "Indien Aan stopt Gajim zodra het venster gesloten wordt. Deze instelling is "
 "alleen geldig als het icoon in het notificatiegebied gebruikt wordt."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Indien Aan registreerd Gajim xmpp:// bij elke start."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4360,7 +4449,7 @@ msgstr ""
 "Indien Aan zal Gajim een icoon op elke tab weergeven met ongelezen "
 "berichten. Afhankelijk van het thema kan dit icoon geanimeerd zijn."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4368,7 +4457,7 @@ msgstr ""
 "Indien Aan zal Gajim het statusbericht van contacten weergeven onder hun "
 "naam in het roostervenster, indien deze niet leeg is"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4377,7 +4466,7 @@ msgstr ""
 "geen bekend is, of de laatste afbeelding te oud is."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4385,20 +4474,20 @@ msgstr ""
 "Indien Uit zullen geen statusberichten weergeven worden in gesprekken "
 "wanneer een contact zijn/haar status aanpassen."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4409,14 +4498,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Slapen"
@@ -4485,185 +4585,99 @@ msgstr ""
 "Geluid om af te spelen bij elk MUC bericht. (Deze instelling is alleen "
 "geldig als notify_on_all_muc_messages aan staat)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "groen"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "kruidenier"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "menselijk"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "simpel"
-
-#: ../src/common/connection.py:68
-#, fuzzy
-msgid "Unable to load idle module"
-msgstr "Niet in staat de ruimte binnen te gaan"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Niet in staat de ruimte binnen te gaan"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "Een wachtwoord is vereist om deze ruimte binnen te komen."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Je bent uit deze ruimte verbannen."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Die ruimte bestaat niet."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "Ruimte creatie is beperkt."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Je geregistreerde bijnaam moet gebruikt worden."
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Je staat niet in de ledenlijst"
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"De gewenste bijnaam is in gebruikt of geregistreerd door een andere "
-"gebruiker.\n"
-"Geef een andere bijnaam op:"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-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:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "we zijn nu op %s geabonneert"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "afmelding verzocht van %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "we zijn nu van %s afgemeld"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 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:1464
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"Jid %s is niet in lijn met de RFC. Het zal niet toegevoegd worden aan jouw "
-"rooster. Gebruik een roostermanagement applicatie zoals http://jru."
-"jabberstudio.org/ om het te verwijderen"
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Ongeldig wachtwoord"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Ongeldig wachtwoord"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Verbonden met server %s:%s met %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Controleer je verbinding of probeer later nogmaals"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggen mislukt met \"%s\""
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 msgid "Please check your login and password for correctness."
 msgstr "Controleer gebruikersnaam en wachtwoord."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP wachtwoord niet opgegeven"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, 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:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "onzichtbaar"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Ik ben %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4672,207 +4686,206 @@ msgstr ""
 "Onderwerp: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Transport %s heeft niet op tijd geantwoord met registratie informatie"
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
+msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Ongeldig character in gebruikersnaam."
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Server adres vereist."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Ongeldig character in hostnaam."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Ongeldig character in bron."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Bezig"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Bezig"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_Niet Beschikbaar"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Niet Beschikbaar"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "Open voor _Gesprek"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Open voor Gesprek"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "_Aanwezig"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Aanwezig"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Bezig met verbinden"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "Af_wezig"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Afwezig"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "Onz_ichtbaar"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Onbekend"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Heeft fouten"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Geen"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "Aan"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "Van"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Geen"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Beheerders"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Beheerder"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Deelnemers"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Deelnemer"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Bezoekers"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Bezoeker"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "let op deze conversatie"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "is met iets anders bezig"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "is een bericht aan het typen..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "pauzeert tijdens het typen van een bericht"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "heeft het gespreksvenster of -tab gesloten"
 
@@ -4882,10 +4895,110 @@ msgstr "heeft het gespreksvenster of -tab gesloten"
 msgid "error: cannot open %s for reading"
 msgstr "fout: kan %s niet voor lezen openen"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "simpel"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "cyaan"
 
+#~ msgid "Send"
+#~ msgstr "Verzend"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr ""
+#~ "%(nickname)s in ruimte %(room_name)s heeft je een nieuw bericht gestuurd."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s heeft je een nieuw bericht gestuurd."
+
+#, fuzzy
+#~ msgid "GUI Migration failed"
+#~ msgstr "vCard publicatie is mislukt"
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "Logboeken zijn met succes omgezet naar de database."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr ""
+#~ "Indien aangevinkt zal Gajim een icoon in het mededelingengebied (systray) "
+#~ "weergeven"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Profiel, Contactafbeelding"
+
+#~ msgid "_Online Users"
+#~ msgstr "_Online Gebruikers"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Start Gesprek met account %s"
+
+#~ msgid "All contacts in this group are offline or have errors"
+#~ msgstr "Alle contacten in deze groep zijn offline of hebben fouten"
+
+#~ msgid "Size: "
+#~ msgstr "Grootte: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "Sessiebus is niet beschikbaar"
+
+#, fuzzy
+#~ msgid "Unable to load idle module"
+#~ msgstr "Niet in staat de ruimte binnen te gaan"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Niet in staat de ruimte binnen te gaan"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Een wachtwoord is vereist om deze ruimte binnen te komen."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Je bent uit deze ruimte verbannen."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Die ruimte bestaat niet."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "Ruimte creatie is beperkt."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Je geregistreerde bijnaam moet gebruikt worden."
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Je staat niet in de ledenlijst"
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "De gewenste bijnaam is in gebruikt of geregistreerd door een andere "
+#~ "gebruiker.\n"
+#~ "Geef een andere bijnaam op:"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "we zijn nu op %s geabonneert"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "afmelding verzocht van %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "we zijn nu van %s afgemeld"
+
+#, fuzzy
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "Jid %s is niet in lijn met de RFC. Het zal niet toegevoegd worden aan "
+#~ "jouw rooster. Gebruik een roostermanagement applicatie zoals http://jru."
+#~ "jabberstudio.org/ om het te verwijderen"
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr ""
+#~ "Transport %s heeft niet op tijd geantwoord met registratie informatie"
+
 #~ msgid "Sound"
 #~ msgstr "Geluid"
 
diff --git a/po/no/LC_MESSAGES/gajim.po b/po/no/LC_MESSAGES/gajim.po
index 0bc8ae773..55e7ab8e5 100644
--- a/po/no/LC_MESSAGES/gajim.po
+++ b/po/no/LC_MESSAGES/gajim.po
@@ -2,12 +2,12 @@
 # This file is distributed under the same license as the Gajim package.
 # Stian B. Barmen <stian@jabber.no>, 2005.
 #
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2005-12-08 14:28+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: \n"
@@ -51,7 +51,7 @@ msgid "Hidden"
 msgstr "Gjemt"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -68,62 +68,59 @@ msgstr ""
 "Utheving av feilstavede ord funksjonen vil ikke bli brukt."
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Samtale"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Samtale"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Kryptering"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s har ikke sendt en OpenPGP nøkkel og du har ikke tilegnet en"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Kryptering påslått"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Kryptering avslått"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "ikke i kontaktliste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -131,20 +128,20 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Hvert %s _minutt"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -192,199 +189,212 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "For å endre konto navnet må du ikke være tilkoblet."
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 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:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 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:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 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:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Kryptering"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 #, fuzzy
 msgid "Member List"
 msgstr "_Medlem"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 #, fuzzy
 msgid "Owner List"
 msgstr "_Eier"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 #, fuzzy
 msgid "Nick"
 msgstr "_Kast ut"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 #, fuzzy
 msgid "Role"
 msgstr "Rolle:"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 #, fuzzy
 msgid "Banning..."
 msgstr "Utvis %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Hva ønsker du å gjøre?</b>"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Hva ønsker du å gjøre?</b>"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Hva ønsker du å gjøre?</b>"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Hva ønsker du å gjøre?</b>"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -394,75 +404,85 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "Kontoen \"%s\" er tilkoblet til serveren"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Dersom du fjerner den vil tilkoblingen mistes."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Kontoen \"%s\" er tilkoblet til serveren"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Dersom du fjerner den vil tilkoblingen mistes."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Nytt Rom"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 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:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 msgid "You must enter a password for the new account."
 msgstr "Du må skrive inn et passord for den nye kontoen"
 
-#: ../src/config.py:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Ugyldig Jabber ID"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Kontakten er allerede listet  i din kontaktliste."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -471,19 +491,19 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Det skjedde en feil ved oppretting av kontoen"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
@@ -542,162 +562,161 @@ msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindinger mangler på denne maskinen"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Kontaktens navn: <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Transporter"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Forvalgt Status Melding</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Skriv inn din nye status melding:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Transporter"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abbnerings ønske for konto %s fra %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abbonerings ønske fra %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 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:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -706,157 +725,164 @@ msgstr ""
 "å sende en melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Tilbkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Ny Melding"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Ny Melding"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Fil Overførings Forespørsel"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Fil Overføring Feilet"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Fil Overføring Komplett"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Fil Overføring Stoppet"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 msgid "New E-mail"
 msgstr ""
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Fil Overførings Forespørsel"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Fil Overføring Feilet"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Fil Overføring Komplett"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Fil Overføring Stoppet"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "?Group Chat Contact Role:Ingen"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Enslig Melding med konto %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "XML Konsoll"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "Invitert %(contact_jid)s til %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester"
@@ -865,11 +891,11 @@ msgstr "Se etter Tjenester"
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -877,175 +903,176 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "bruker kontoen %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skanner %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Fil"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Lagret i: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Åpne Foreldre Katalog"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Fil overføring avbrutt"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "Tilkoblingen kan ikke opprettes."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Fil overføringen ble stoppet av kontakten på den andre siden"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Send"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "_Send"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim får ikke tilgang til filen"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Denne filen er i bruk av en annen prosess."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Hva ønsker du å gjøre?</b>"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Lagre Fil som..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Ønsker du å overskrive den?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1053,7 +1080,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
@@ -1070,12 +1097,12 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Avsender: "
 
@@ -1083,32 +1110,32 @@ msgstr "Avsender: "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Fortsett"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "vis hjelp for en spesifisert kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Aktiver nytt vindu med den neste uleste melingen"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1116,45 +1143,45 @@ msgstr ""
 "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
 "en egen linje"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Endrer status på konto eller kontoer"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "melding"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "status melding"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1162,19 +1189,19 @@ msgstr ""
 "endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
 "til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "om spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1184,113 +1211,113 @@ msgstr ""
 "konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten 'OpenPGP "
 "nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Viser alle instillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'nøkkel' er navnet på instillingen, 'verdi' er gjeldende instilling"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Sletter en instilling"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "nøkkel"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "navnet på instillingen som skal slettes"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver gjeldende Gajim instillinger til .config filen"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Legger til kontakt til kontaktlisten"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Legger til ny kontakt til denne kontoen."
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerer instillinger (globale instillinger om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
@@ -1298,16 +1325,16 @@ msgstr ""
 "Returnerer instillinger (globale instillinger om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1316,16 +1343,16 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Venligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Ukjent D-Bus versjon: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1334,16 +1361,16 @@ msgstr ""
 "Bruk: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1352,7 +1379,7 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1361,31 +1388,31 @@ msgstr ""
 "Argumenteet \"%s\" er ikke spesifisert. \n"
 "Skriv \"%s hjelp %s\" for mer informasjon"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim trenger en Xserver for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim trenger PyGTK 2.6 eller høyere"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim tenger PyGTK 2.6 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim trenger GTK 2.6 eller høyere"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim trenger GTK 2.6 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ mangler libglade støtte"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1394,133 +1421,152 @@ msgstr ""
 "Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
 "versjon fra %s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Vennligst sjekk at gtk og pygtk har libglade støtte på ditt system."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim trenger PySQLite2 for å kjøre"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autentisering for %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:498
-#, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "%(nickname)s i rom %(room_name)s har sendt deg en ny melding."
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Kontakt Logget På"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s har sendt deg en ny melding."
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Kontakt Logget Av"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Ny Privat Melding"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Ny Melding"
+
+#: ../src/gajim.py:610
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr ""
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "feil ved sending"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abbonementet fra deg"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Du vil alltid se han eller henne som frakoblet."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s er nå %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] "Du har uleste meldinger"
 msgstr[1] "Du har uleste meldinger"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har vellykket sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "vCard publisering vellykket"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Din personlige informasjon har blitt publisert uten feil."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1530,162 +1576,146 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine instillinger og valg"
 
-#: ../src/gajim.py:1719
-#, fuzzy
-msgid "GUI Migration failed"
-msgstr "vCard publisering feilet"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "Loggene ble migrert til databasen uten feil."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Migrerer Logger..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Vennligst vent mens loggene blir migrert..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Tema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "tema navn"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Du kan ikke slette ditt gjeldene tema"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Start Samtale"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Start Samtale"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, 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/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Gruppe Samtale"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Gruppe Samtale"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Dette rommet har ingen tittel"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt uønsket av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s er nå %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invitert %(contact_jid)s til %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ser ikke ut til å være en gyldig JID"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Ingen slik kommando: /%s (dersom du ønsker å sende likevel, så skriv /say "
 "før teksten)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1698,7 +1728,7 @@ msgstr ""
 "\". Skulle en bruker med den JIDen være tilstede i rommet vil denne også bli "
 "kastet ut. Det støttes ikke med mellomrom i kallenavnet."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1706,12 +1736,12 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu til den "
 "spesifiserte brukeren."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1720,12 +1750,12 @@ msgstr ""
 "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
 "dersom spesifisert."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Bruksanvisning: /%s, setter gruppesamtale vinduet til kompakt modus."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1734,7 +1764,7 @@ msgstr ""
 "Bruksanvisning: /%s <JID> [årsak], inviterer JID til gjeldende rom, og viser "
 "en årsak dersom spesifisert."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1743,7 +1773,7 @@ msgstr ""
 "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
 "gir mulighet for å spesifisere valgfritt kallenavn."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1754,7 +1784,7 @@ msgstr ""
 "kallenavn fra rommet og viser om spesifisert en årsak. Støtter ikke "
 "mellomrom i kallenavn."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1763,7 +1793,7 @@ msgstr ""
 "Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk "
 "tredje person. (f.eks. /%s eksploderer.)"
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1772,19 +1802,19 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn> [melding], åpner et privat meldingsvindu og "
 "sender meldingen til brukeren spesifisert av kallenavn."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr ""
 "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende rom."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Bruksanvisning: /%s [tittel], viser eller oppdaterer gjeldende rom tittel."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -1792,70 +1822,70 @@ msgstr ""
 "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
 "kommandoer."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjelpe informasjon for /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av rommet \"%s\"?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Dersom du lukker dette vinduet, så vil du bli koblet fra dette rommet."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "Rommet \"%s\" er allerede i dine bokmerker."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Utvis %s"
@@ -1903,111 +1933,120 @@ msgstr "<b>Editering av Avanserte Instillinger</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Applikasjoner</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Egendefinert</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Beskrivelse</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Utseende på en linje</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Grensenitt valg</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Trafikk</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diverse</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig Informasjon</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Vennligst velg ett av valgene under:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Vennligst fyll in data for din nye konto</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Vennligst velg ett av valgene under:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Forvalgt Status Melding</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Egenskaper</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Instillinger</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Lyder</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Skriv inn din nye status melding:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuelle Alarmer</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Hva ønsker du å gjøre?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Input</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "En liste over aktive, komplette og stoppede fil overføringer"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "K_ontoer"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Etter kallenavn:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "Om"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Godkjenn"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Konto"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2019,52 +2058,44 @@ msgstr ""
 "Kontakt\n"
 "Fane"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Konto Endring"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "Av_anserte Handlinger"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Legg til ny Kontakt"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Visuelle Alarmer</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Ny _Kontakt"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Avansert Konfigurasjons Editor"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Etter kallenavn:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Etter tid:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2074,56 +2105,56 @@ msgstr ""
 "Bare komponering \n"
 "Deaktivert"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Tillat _OS informasjon å bli sendt"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Tillat han/henne å se min status"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "Også kjent som iChat stil"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Forespør hans/hennes status"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Spør:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Tilegn Open_PGP Nøkkel"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Godkjenn kontakt så han kan vite når du er tilkoblet"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Auto _borte etter:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Auto _ikke tilgjengelig etter:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Auto bli med"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2135,15 +2166,15 @@ msgstr ""
 "Alltid bruk KDE standard applikasjoner\n"
 "Egendefinert"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Automatisk godkjenn kontakt"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Koble til på nytt automatisk når kontakten mistes"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2156,13 +2187,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Før kallenavn:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Før tid:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Før kallenavn:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2277,132 +2305,136 @@ msgid "Company:"
 msgstr "Bedrift:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Konfigurer _Rom"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Koble til når jeg klikker Ferdig"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Kontaktinformasjon"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "Kontakt_Info"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "Samtale Historikk"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "Land:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "Standard _status ikonsamling:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Slett MFD (MOTD)"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Slett Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Sletter Meling for Dagen"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Nekt"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr "Avslå godkjenning fra kontakt så han ikke kan se når du er tilkoblet"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Avdeling:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Viser kontaktikoner for kontakter i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Vis status melding for kontakter i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "E-Post:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "Hvert 5 _minutt"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Rediger Grupper"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Rediger Personlig Informasjon..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Behandle Uttrykksikoner"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Slå på"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Skriv inn en gang til for verifisering:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Skriv inn nytt passord:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "Hvert 5 _minutt"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Ekstra Adresse:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Etternavn:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Fil Overføringer"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "Fil _Overføringer"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Fil behandler:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Filter:"
@@ -2412,39 +2444,35 @@ msgid "Font style:"
 msgstr "Font stil:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Font:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Forby han/henne å se min status"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Ofte Stilte Spørsmål (online)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "Fra:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "G_å"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Gajim Tema Valg"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2454,7 +2482,7 @@ msgstr ""
 "Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha "
 "med en kontakt"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2462,7 +2490,7 @@ msgstr ""
 "Gajim vil autmatisk vise deg den nye meldingen i et samtalevindu eller fane "
 "i det eksisterende samtalevinduet"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2471,7 +2499,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:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2479,7 +2507,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:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2487,26 +2515,34 @@ 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:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajimvil bare endre ikonet til kontakten som har sendt den nye meldingen"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Opprettings Veiviser"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Generelle"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Fornavn:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Ingen"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Gruppe:"
@@ -2554,18 +2590,24 @@ msgid "I would like to add you to my contact list."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
 #: ../src/gtkgui.glade.h:170
-msgid "If checked, Gajim will also have a trayicon"
-msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
+msgstr ""
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
 "i kontaktliste vinduet."
@@ -2646,8 +2688,9 @@ msgstr ""
 "kontakter som om du hadde en konto"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Innkommende melding:"
+#, fuzzy
+msgid "Inactive"
+msgstr "Aktiv"
 
 #. 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:185
@@ -2683,39 +2726,57 @@ msgid "Location"
 msgstr "Plassering"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Melding"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Behandle..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Behandle Kontoer"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Behandle Bokmerker"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Behandle Proxy Profiler"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Behandle..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Mellomnavn:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "Mod_ererer"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Mer"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2723,109 +2784,105 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Alarmer meg om kontakter som:"
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "På hver _melding"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 #, fuzzy
 msgid "One message _window:"
 msgstr "Send melding og lukk vinduet"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Åpne..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Utgående melding:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Passord setning"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Pauset"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Personlig Informasjon"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Telefon Nummer:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Port:"
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Plassering:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Post Kode:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Tittel:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "status melding"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Utskrifts tid:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Priorit_et:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2835,59 +2892,51 @@ 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:237
-msgid "Profile, Avatar"
-msgstr "Profil, Bilde"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Spørrings Bygger..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Nylig:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Registrer til:"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Fjern kontoe _bare fra Gajim"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Fjern konto fra Gajim og fra _serveren"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Fjern filoverføringen fra listen"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr "Fjerner komplette, avbrutte og feilede filoverføringer fra listen"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Svar på denne meldingen"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Tilbakestill til Standard Farger"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "Ressu_rs:"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2901,168 +2950,160 @@ msgstr ""
 "navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få "
 "hendelsene. (se under)"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Ressurs:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Rolle:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Rom Instillinger"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Lagre _passord setning (usikkert)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr "Lagre _posisjon og størrelse for kontaktliste og samtalevinduer"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Lagre Fil som..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Lagre samtale _logger for alle kontakter"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Lagre pass_ord"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Search"
 msgstr "_Søk"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "Sen_d"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Send Fil"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Send _Melding"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Send _Fil"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Send _Ny Melding..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Send hold-i-live meldinger"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Send melding"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Send melding og lukk vinduet"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 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:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Server Funksjonalitet"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Velg MFD (MOTD)"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Velg Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Velg _Avatar"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Velg et ikonbilde (avatar) når jeg kobler til"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Setter Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Vis Alle _Handlinger som Venter"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Vis _Frakoblede Kontakter"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Vis _Kontaktliste"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Vis _XML Konsoll"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 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:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Sorter kontakter etter status"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Start _Samtale"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Fylke:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Status melding:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Status:"
@@ -3093,25 +3134,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Tema:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "Tekst _farge:"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "Tekst _font:"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "Den automatiserte borte meldinen"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "Den autmatiserte ikke tilgjengelig meldingen"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Tema:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3137,50 +3179,56 @@ msgid "Type:"
 msgstr "Skriv:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Strek Under"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "Oppdater MFD (MOTD)"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Oppdater Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Uppdaterer Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Bruk _SSL (gammel)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "Bruk _transportenes ikoner"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Bruk autentisering"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Bruk egendefinert maskinnavn/port"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "fil overførings liste"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Ikon i systemstatusfelt (også kjent som systray)"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Når en fil overføring er komplett vis en sprettopp informasjon"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3193,21 +3241,21 @@ msgstr ""
 "bare skje dersom du får en ny melding fra en kontakt du ikke er i samtale "
 "med."
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Når en ny hendelse blir motatt"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Jobb"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3215,414 +3263,453 @@ msgstr ""
 "Du trenger en konto før du kan koble\n"
 "til Jabber nettverket."
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Din JID:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Handlinger"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "_Legg til Kontakt..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "_Legg til Kontaktliste"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "_Avansert"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Etter tid:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Godkjenn"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "_Bakgrunn:"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Utvis"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Før tid:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "Lag _Bokmerke til Rommet"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "_Kompakt Utseende    Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "_Kopier JID/E-post Adresse"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Kopier Link PLassering"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Nekt"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Oppdag Tjenester..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Fil behandler:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Font:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "_Gruppe Samtale"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_Historie"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Ikon i systemstatusfelt (også kjent som systray)"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Innkommende melding:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "_Bli med i Nytt Rom"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "_Kast ut"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "_Slå sammen kontoer"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Endre"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "_Rediger Konto..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Navn:"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Aldri"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "_Gi meg beskjed om det"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Gi meg beskjed når filoverføring er komplett"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "_Beboer Handling"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "_Online Brukere"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Åpne ny Epost"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Åpne Link i Nettleser"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Åpne..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Utgående melding:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "_Eier"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Spiller:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Sprett opp"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Instillinger"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Publisér"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "_Fjern fra Kontaktliste"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Svar"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Tilbakestill til Standard Farger"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Hent"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Passord:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Søk"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "_Send"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "_Send & Lukk"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "_Send Privat Melding"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "_Send Server Melding"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "_Send Melding"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Sorter kontakter etter status"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Status melding:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Abbonér"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Abonement"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+msgid "_URL:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Bruk proxy"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "_Brukernavn:"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Stemme"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "_XML Konsoll..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "fil overførings liste"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "minutter"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Feil under traversering av fil:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Kunne ikke skrive til %s. Sesjons Håndterings støtte vil ikke virke."
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Søk"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Slett MFD (MOTD)"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Søk"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "lager logg database"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3631,36 +3718,36 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Migrerer Logger..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Dato"
@@ -3694,75 +3781,81 @@ msgstr "Status er nå: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Melding"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Start samtale med konto %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 #, fuzzy
 msgid "Observers"
 msgstr "Server"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Du er allerede i rom %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "_Bli med i Nytt Rom"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Behandle Bokmerker..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Behandle Bokmerker..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_Historie"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "_Bli med i Nytt Rom"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3770,69 +3863,78 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne "
 "transporten."
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "_Logg på"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "Logg _av"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "Abbonerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Dersom \"%s\" aksepterer denne forespørselen vil du få vite hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
+"at han eller henne alltid vil se deg som frakoblet."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3840,37 +3942,37 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
 "at han eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 msgid "I want this contact to know my status after removal"
 msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Skriv OpenPGP nøkkel passordsetning for konto %s"
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Lagre passordsetning"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Passord setning"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3878,19 +3980,19 @@ msgstr ""
 "Endring av status til usynlig vil resultere i at du forlater disse gruppe "
 "samtalene. Er du sikker på at du ønsker å bli usynlig?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 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:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3898,151 +4000,139 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått."
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Fra %s i rom %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Sender fil til en kontakt"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../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"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %d ulest melding"
 msgstr[1] "Gajim - %d uleste meldinger"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - %d ulest melding"
 msgstr[1] "Gajim - %d uleste meldinger"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - %d ulest melding"
 msgstr[1] "Gajim - %d uleste meldinger"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - %d ulest privat melding"
 msgstr[1] "Gajim - %d uleste private meldinger"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Rolle: "
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Tilhørighet: "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Status: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Abbonement: "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "Standard _status ikonsamling:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Størrelse: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Type: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Størrelse: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Type: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Pauset"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4050,33 +4140,33 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Velg Bilde"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Bilder"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Utforsking %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4084,7 +4174,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4092,13 +4182,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4106,23 +4196,23 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du venter på kontaktens svar på din abbonerings forespørsel"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr "Uten en tilkobling kan du ikke publisere din kontakt informasjon."
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "Uten en tilkobling kan du ikke hente din kontakt informasjon."
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 #, fuzzy
 msgid "Personal details"
 msgstr "Personlig Informasjon"
@@ -4167,45 +4257,47 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus finnes ikke på denne maskinen eller python modulen mangler"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "Sesjons buss ikke tilgjengelig"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Bruk DBus og Hendelses-Tjenesten for å vise hendelser"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minutter før status endres til borte."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Borte på grunn av inaktivitet"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minutter før status endres til ikke tilgjengelig."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Ikke tilgjengelig på grunn av inaktivitet"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Dersom True, ikke fjern */_ . Så *abc* vil bli uthevet men * * ikke vil bli "
 "fjernet."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Legg * og [n] inn i kontaktliste tittelen?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4213,12 +4305,12 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
 "blir åpnet på nytt."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4226,20 +4318,20 @@ msgstr ""
 "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
 "Klient standard oppførsel)."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Bruk kompakt utseende når du åpner et samtale vindu"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Bruk kompakt utseende når du åpner et gruppe samtale vindu"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4248,29 +4340,29 @@ msgstr ""
 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
 "'WIKTIONARY' som betyr bruk wiktionary."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4278,29 +4370,29 @@ msgstr ""
 "Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med "
 "adresse oversetting/port videresending."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare en samtale?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Vis fane felt ved bare en aktiv samtale?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtale."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4308,11 +4400,11 @@ msgstr ""
 "Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket "
 "på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Dersom True vil Gajim registreres for xmpp:// ved hver oppstart."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4320,7 +4412,7 @@ msgstr ""
 "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
 "meldinger. Avhengig av valgte tema kan dette ikonet være animert."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4328,7 +4420,7 @@ msgstr ""
 "Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
 "kontakt under kontaktens navn i kontaktliste vinduet."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4337,7 +4429,7 @@ msgstr ""
 "et ikonbilde sist gang eller har en lagret som er for gammel."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4345,20 +4437,20 @@ msgstr ""
 "Dersom False vil du ikke lenge kunne se status linjer i samtaler når en "
 "kontakt endrer hans eller hennes status og/eller status melding. "
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4369,14 +4461,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Sover"
@@ -4445,183 +4548,97 @@ msgstr ""
 "Lyd som spilles når en ny MUC melding kommer. (Denne instillingen er kun "
 "aktiv når notify_on_all_muc_messages er True)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "enkel"
-
-#: ../src/common/connection.py:68
-#, fuzzy
-msgid "Unable to load idle module"
-msgstr "Klarer ikke å gå inn i gruppesamtale"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Klarer ikke å gå inn i gruppesamtale"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "Et passord kreves for å bli med i dette samtalerommet."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Du er uønsket i dette rommet."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Et slikt rom finnes ikke."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "Rom oppretting er begrenset."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Ditt registrerte kallenavn må bli brukt. "
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Du er ikke medlems listen."
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Ditt ønskede kallenavn er i bruk eller er registrert av en annen "
-"samtalebruker.\n"
-"Vennligst skriv et annet kallenavn under:"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-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:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "vi abbonerer nå på %s"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "frakoblings ønske fra %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "vi abbonerer ikke lenger på %s"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 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:1464
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"Jid %s er ikke RFC kompatilbel. Den vil ikke bli lagt til kontaktlisten. "
-"Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ "
-"for å fjerne den"
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Ugyldig passord"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Ugyldig passord"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Tilkoblet til server %s:%s med %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 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:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passordsetning ble ikke gitt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, 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:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "usynlig"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Jeg er %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Denne meldingen er kryptert]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4630,207 +4647,206 @@ msgstr ""
 "Tittel: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
+msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brukernavn."
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Server adresse kreves."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i domene navn."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Borte"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "Fra"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Abbonér"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Modererere"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Modererer"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "skriver en melding..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
@@ -4840,10 +4856,106 @@ msgstr "har lukket samtalevinduet eller fanen"
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "enkel"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "turkis"
 
+#~ msgid "Send"
+#~ msgstr "Send"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr "%(nickname)s i rom %(room_name)s har sendt deg en ny melding."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s har sendt deg en ny melding."
+
+#, fuzzy
+#~ msgid "GUI Migration failed"
+#~ msgstr "vCard publisering feilet"
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "Loggene ble migrert til databasen uten feil."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Profil, Bilde"
+
+#~ msgid "_Online Users"
+#~ msgstr "_Online Brukere"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Start samtale med konto %s"
+
+#~ msgid "All contacts in this group are offline or have errors"
+#~ msgstr "Alle kontakter in denne gruppen er frakoblet eller har feil"
+
+#~ msgid "Size: "
+#~ msgstr "Størrelse: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "Sesjons buss ikke tilgjengelig"
+
+#, fuzzy
+#~ msgid "Unable to load idle module"
+#~ msgstr "Klarer ikke å gå inn i gruppesamtale"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Klarer ikke å gå inn i gruppesamtale"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Et passord kreves for å bli med i dette samtalerommet."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Du er uønsket i dette rommet."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Et slikt rom finnes ikke."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "Rom oppretting er begrenset."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Ditt registrerte kallenavn må bli brukt. "
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Du er ikke medlems listen."
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "Ditt ønskede kallenavn er i bruk eller er registrert av en annen "
+#~ "samtalebruker.\n"
+#~ "Vennligst skriv et annet kallenavn under:"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "vi abbonerer nå på %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "frakoblings ønske fra %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "vi abbonerer ikke lenger på %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "Jid %s er ikke RFC kompatilbel. Den vil ikke bli lagt til kontaktlisten. "
+#~ "Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio."
+#~ "org/ for å fjerne den"
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
+
 #~ msgid "Sound"
 #~ msgstr "Lyd"
 
diff --git a/po/pl/LC_MESSAGES/gajim.po b/po/pl/LC_MESSAGES/gajim.po
index 50603b05a..be1276ea4 100644
--- a/po/pl/LC_MESSAGES/gajim.po
+++ b/po/pl/LC_MESSAGES/gajim.po
@@ -5,12 +5,12 @@
 # Automatically generated, 2005.
 # 
 # 
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2005-12-11 20:51+0100\n"
 "Last-Translator: Witek Kieraś <pambuk@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -55,7 +55,7 @@ msgid "Hidden"
 msgstr "Ukryte"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -72,64 +72,61 @@ msgstr ""
 "Podświedlanie błędów w pisowni nie będzie używane"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 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/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Rozmowa"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Rozmowa"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "Szyfrowanie OpenPGP"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "Ani %s nie przesyła swojego klucza OpenPGP ani Ty nie przypisałeś mu żadnego "
 "klucza."
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Szyfrowanie włączone"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Szyfrowanie wyłączone"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "spoza listy kontaktów"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Właśnie otrzymałeś nową wiadomość od \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -137,20 +134,20 @@ msgstr ""
 "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
 "utracisz tę wiadomość."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Co %s _minut(y)"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -198,200 +195,213 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 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:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 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:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Szyfrowanie OpenPGP"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Nie wybrano żadnego klucza"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Serwer"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 #, fuzzy
 msgid "Member List"
 msgstr "_Uczestnik"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 #, fuzzy
 msgid "Owner List"
 msgstr "_Właściciel"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 #, fuzzy
 msgid "Nick"
 msgstr "Wy_rzuć"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 #, fuzzy
 msgid "Role"
 msgstr "Funkcja:"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 #, fuzzy
 msgid "Banning..."
 msgstr "Zabanuj %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Co chcesz zrobić?</b>"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Co chcesz zrobić?</b>"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Co chcesz zrobić?</b>"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Co chcesz zrobić?</b>"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -401,75 +411,85 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "Konto \"%s\" jest połączone z serwerem."
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Konto \"%s\" jest połączone z serwerem."
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Nowy pokój"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 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:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 msgid "You must enter a password for the new account."
 msgstr "Musisz wpisać hasło dla nowego konta."
 
-#: ../src/config.py:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się."
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Niepoprawny Jabber ID"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -477,19 +497,19 @@ msgstr ""
 "Możesz ustawić opcje zaawansowane wciskając przycisk Zaawansowane lub "
 "później wybierając pozycję Konta z menu Edytuj w głównym oknie programu."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Twoje konto zostało założone"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
@@ -548,161 +568,160 @@ msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Na tym komputerze brakuje pythonowych dowiązań do D-Bus."
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Nie można użyć D-Bus."
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Nazwa kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Transporty"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "W grupie"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "Identyfikator klucza"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Nazwa kontaktu"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "Informacja o statusie %s"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Opis Statusu"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Zapisane opisy</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Wpisz nowy opis statusu:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać do konta %s."
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać."
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Transporty"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "Niepoprawny identyfikator użytkownika"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Usługa nie zawiera elementów, które można przeglądać."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Kontakt jest już na liście kontaktów"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "Klient jabbera w GTK+."
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr "Tłumaczenie na język polski: Witold Kieraś <pambuk@gmail.com>"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Prośba o autoryzację dla konta %s od %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 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:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dołącz do pokoju z konta %s."
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "Niepoprawna nazwa użytkownika"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Rozpocznij rozmowę z konta %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowę"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -711,157 +730,164 @@ msgstr ""
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 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:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Pytanie o przysłanie pliku"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Błąd przesyłania pliku"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Zakończono przesyłanie pliku."
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Przesyłanie pliku zatrzymane"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 msgid "New E-mail"
 msgstr ""
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Pytanie o przysłanie pliku"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Błąd przesyłania pliku"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Zakończono przesyłanie pliku."
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Przesyłanie pliku zatrzymane"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "?Funkcja kontaktu w pokoju: Brak"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "wiadomość z konta %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "Konsola XML"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Inni"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Konferencja"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Nie możesz przeglądać usług, jeśli nie jesteś połączony."
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Przeglądanie usług"
@@ -870,11 +896,11 @@ msgstr "Przeglądanie usług"
 msgid "Service Discovery"
 msgstr "Przeglądanie usług"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Nie można odnaleźć usługi"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -882,175 +908,176 @@ msgstr ""
 "Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź "
 "adres i spróbuj ponownie."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Tej usługi nie można przeglądać"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Tego typu usługa nie zawiera elementów, które można przeglądać."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "używając konta %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "Prze_glądaj"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Usługa nie zawiera elementów, które można przeglądać."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Dołącz"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "_Modyfikuj"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skanowanie %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Użytkownicy"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Opis"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Plik"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Czas"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Postęp"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazwa pliku: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Rozmiar: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Ty"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Nadawca: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Odbiorca: "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Zapisane w: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Zakończono przesyłanie pliku."
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Otwórz katalog zawierający ten plik."
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Transfer pliku skasowany"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "Nie można ustanowić połączenia z drugą stroną."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Przesyłanie pliku zostało zatrzymane przez drugą osobę."
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Wybierz plik do wysłania..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Wyślij"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "_Wyślij"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim nie ma dostępu do tego pliku"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Ten plik jest używany przez inny proces."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Ten plik już istnieje"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Co chcesz zrobić?</b>"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Plik: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s chce przesłać Ci plik:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Zapisz plik jako..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Czy chcesz go nadpisać?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1058,7 +1085,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/ów)"
@@ -1075,12 +1102,12 @@ msgstr "Plik: "
 msgid "It is not possible to send empty files"
 msgstr "Nie można wysłać pustego pliku"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Nadawca: "
 
@@ -1088,32 +1115,32 @@ msgstr "Nadawca: "
 msgid "Pause"
 msgstr "Zatrzymaj"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Kontynuuj"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "pokaż pomoc dla wybranego polecenia"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "polecenie"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "pokaż pomoc polecenia"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Pokazuje lub ukrywa okno listy kontaktów."
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Pokazuje okno z następną nieprzeczytaną wiadomością"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1121,45 +1148,45 @@ msgstr ""
 "Wypisuje listę wszystkich kontaktów. Każdy kontakt zostanie wypisany w "
 "osobnej linii."
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "pokaż tylko kontakty z danego konta"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Wypisuje listę zarejestrowanych kont"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Zmienia status kont lub kont."
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: rozłączony, dostępny, chętny do rozmowy, zaraz wracam, nieobecny, "
 "zajęty, niewidoczny "
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "wiadomość"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "nformacja o statusie"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1168,20 +1195,20 @@ msgstr ""
 "zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
 "statusem globalnym."
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Pokazuje okno dialogowe umożliwiające wysłanie wiadomości do kontaktu."
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID osoby, z którą chcesz porozmawiać"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "jeśli jest podany, to kontakt jest pobierany z listy kontaktów tego konta"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1191,126 +1218,126 @@ msgstr ""
 "są opcjonalne. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', to "
 "ustaw 'klucz OpenPGP' na ''."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "JID osoby, która otrzyma wiadomość"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "zawartość wiadomości"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "klucz pgp"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "jeśli jest podany, to wiadomość zostanie zaszyfrowana tym kluczem publicznym"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "jeśli jest podane, to wiadomość zostanie wysłana z tego konta"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Pobiera szczegółowe informacje o kontakcie"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Pobiera szczegółowe informacje o kontakcie"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Żadne z twoich kont nie jest aktywne."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Wysyła plik kontaktowi"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "plik"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Ścieżka do pliku"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "plik zostanie wysłany z tego konta, jeśli jest ono podane"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Wypisuje wszystkie opcje i ich wartości"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ustawia wartość 'klucza' na 'wartość'."
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "klucz=wartość"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'klucz' jest nazwą opcji, 'wartość' zaś jest jej ustawianą wartością"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Usuwa opcję"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "klucz"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "nazwa opcji do usunięcia"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje obecny stan opcji Gajima do pliku .config"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Usuwa kontakt z listy kontaktów"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt do listy kontaktów"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Dodaje nowy kontakt do tego konta."
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Zwraca obecny status (globalny, chyba, że zostało wskazane konto)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr "Zwraca obecny status (globalny, chyba, że zostało wskazane konto)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Brak argumentu \"contact_jid\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1319,16 +1346,16 @@ msgstr ""
 "'%s' nie znajduje się na twojej liście kontaktów.\n"
 "Podaj konto, na które ma zostać wysłana ta wiadomość."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Żadne z twoich kont nie jest aktywne."
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Nieznana wersji D-Bus: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1337,16 +1364,16 @@ msgstr ""
 "Zużycie:·%s·%s·%s·\n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "Nie znaleziono %s"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1355,7 +1382,7 @@ msgstr ""
 "Użycie: polecenie %s [argument]\n"
 "Gdzie polecenie to jedna z następujący fraz:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1364,32 +1391,32 @@ msgstr ""
 "Argument \"%s\" nie jest określony. \n"
 "Wpisz \"%s·help·%s\" aby uzyskać więcej informacji."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim wymaga do działania serwera X. Zakończenie..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim wymaga PyGTK w wersji 1.6 lub wyższej"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr ""
 "Gajim wymaga do działania PyGTK w wersji 1.6 lub wyższej. Zakończenie..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim wymaga GTK w wersji 2.6 lub wyższej"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim wymaga do działania GTK w wersji 2.6 lub wyższej. Zakończenie..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "W GTK+ brakuje wsparcia dla libglade"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1397,83 +1424,107 @@ msgid ""
 msgstr ""
 "Proszę usunąć obecną wersje GTK+ i zainstalować najnowszą stabilną wesję z %s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Sprawdź, czy gtk posiada w twoim systemie wsparcie dla pygtk i libglade."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim wymaga do działania PySQLite2"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autoryzacja HTTP (%s) dla %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Czy akceptujesz tę prośbę?"
 
-#: ../src/gajim.py:498
-#, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "%(nickname)s·w pokoju·%(room_name)s·przesłał ci nową wiadomość."
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Kontakt połączył się"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s przesłał ci nową wiadomość."
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Kontakt rozłączył się"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Wyślij prywatną wiadomość"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nowa wiadomość"
+
+#: ../src/gajim.py:610
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr ""
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "błąd przy wysyłaniu"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Autoryzacja przyjęta"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" udzielił Ci autoryzacji byś mógł widzieć jego status."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Nie można ustanowić połączenia z \"%s\""
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Sprawdź swoje połączenie lub spróbuj później."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s ma teraz status %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Twoje hasło jest niepoprawne."
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
@@ -1481,51 +1532,46 @@ msgstr[0] "Masz nieprzeczytane wiadomości"
 msgstr[1] "Masz nieprzeczytane wiadomości"
 msgstr[2] "Masz nieprzeczytane wiadomości"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s chce przesłać ci plik."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Otrzymałeś plik %(filename)s od %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Przesyłanie pliku %(filename)s·od·%(name)s·zostało zatrzymane."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Przesłałeś plik %(filename)s do %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Przesyłanie pliku·%(filename)s·do·%(name)s·zostało zatrzymane."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "Publikacja vCard powiodła się"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Informacje o tobie zostały opublikowane."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "Publikacja vCard nie powiodła się"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1535,161 +1581,145 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Nie można zapisać twoich ustawień i opcji."
 
-#: ../src/gajim.py:1719
-#, fuzzy
-msgid "GUI Migration failed"
-msgstr "Publikacja vCard nie powiodła się"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "Logi zostały przeniesione do bazy danych."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Wsparcie dla Menadżera Sesji jest niedostępne (brak modułu gnome.ui"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Przenoszenie Logów..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Proszę poczekać na przeniesienie logów..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Motyw"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "nazwa motywu"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Nie możesz skasować obecnie używanego motywu"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Ustaw najpierw inny motyw"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Rozpocznij rozmowę"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Rozpocznij rozmowę"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Wysyłanie prywatnej wiadomości nie powiodło się."
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, 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/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Pokój"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Pokój"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Ten pokój nie ma tematu"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s został wyrzucony przez %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s został zabanowany przez %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s występuje teraz jako %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s ma teraz status %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Pseudonim nie został odnaleziony: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nie wygląda na poprawny JID"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Nie ma takiego polecenia: /%s (jeśli chcesz je wysłać, poprzedź je znakami: /"
 "say)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Polecenia: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1701,18 +1731,18 @@ msgstr ""
 "może zostać zmieniony o ile nie zawiera \"@\". Jeśli JID jest obecnie w "
 "pokoju, to zostanie z niego wyrzucony. NIE toleruje spacji w pseudonimie."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr "Użycie: /%s <pseudonim> otwiera okno prywatnej rozmowy z tą osobą."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Użycie: /%s czyście okno tekstowe."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1721,12 +1751,12 @@ msgstr ""
 "Użycie: /%s [powód] zamyka aktualne okno lub kartę i wyświetla powóc, jeśli "
 "został podany."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Użycie: /%s przestawia okno rozmowy w pokoju na widok zwarty."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1735,7 +1765,7 @@ msgstr ""
 "Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie "
 "wyświetlając powód."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1744,7 +1774,7 @@ msgstr ""
 "Użycie: /%s <pokój>@<serwer>[/pseudonim] oferuje przyłączenie się do "
 "pokój@serwer opcjonalnie z wykorzystaniem podanego psedonimu."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1754,7 +1784,7 @@ msgstr ""
 "Użycie: /%s <pseudonim> [powód] usuwa podaną poprzez pseudonim osobę z "
 "pokoju i opcjonalnie wyświetla powód. NIE wspiera spacji w pseudonimie."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1763,7 +1793,7 @@ msgstr ""
 "Użycie: /%s <działanie> wysyła działanie do aktualnego pokoju. Używaj w "
 "trzeciej osobie (np. /%s eksploduje.)"
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1772,87 +1802,87 @@ msgstr ""
 "Użycie: /%s <pseudonim> [wiadomość] otwiera okno prywatnej wiadomości i "
 "wysyła ją do osoby o takim pseudonimie"
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Użycie: /%s [temat] wyświetla lub aktualizuje temat aktualnego pokoju."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Użycie: /%s <wiadomość> wysyła wiadomość bez sprawdzania innych poleceń."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Brak informacji o pomocy dla /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Czy jesteś pewien, że chcesz opuścić pokój \"%s\"?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Jeśli zamkniesz to okno, to połączenie z tym pokojem zostanie zerwane."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_Nie pytaj mnie o to ponownie."
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Zmiana tematu"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Wpisz nowy temat:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Zmiana pseudonimu"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Wpisz nowy pseudonim, którego chcesz używać:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Zakładka została już dodana"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka została dodana"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Możesz zarządzać zakładkami poprzez menu Działania w oknie kontaktów."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynę:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
@@ -1900,111 +1930,120 @@ msgstr "<b>Edytor zaawansowanych konfiguracji</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Aplikacje</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Własne</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Opis</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Format linii</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Własne ustawienia interfejsu</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Traffic</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Różne</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informacje o sobie</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Wybierz jedną z poniższych opcji:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Wpisz dane do swojego nowego konta</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Wybierz jedną z poniższych opcji:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Zapisane opisy</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Właściwości</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Ustawienia</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Dźwięki</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Wpisz nowy opis statusu:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Powiadomienia wizualne</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Co chcesz zrobić?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>Wejście XML</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Lista aktywnych, ukończonych i zatrzymanych transferów plików."
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "_Konta"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Za pseudonimem:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "Informacje"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Akceptuj"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Konto"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2016,52 +2055,44 @@ msgstr ""
 "Kontakt\n"
 "Banner"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Modyfikacja konta"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Konta"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "Z_aawansowane działania"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Dodaj nowy kontakt"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Powiadomienia wizualne</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Dodaj _kontakt"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Adres"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Edytor zaawansowanych ustawień"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Za pseudonimem:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Po czasie:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2071,57 +2102,57 @@ msgstr ""
 "Tylko dotyczące pisania\n"
 "Wyłączone"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Zezwól na wysyłanie informacji o systemie _operacyjnym"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Pozwól mu/jej widzieć swój status"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Pokazuj powiadomienia gdy mam status _zaraz wracam/nieobecny/zajęty/"
 "niewidoczny"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "Znany także jako styl iChat"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Pytaj o opis przy zmianie statusu na:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Poproś o to, żeby móc widzieć jego/jej status"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Pytaj:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Przypisz klucz Open_PGP"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Autoryzuj kontakt - będzie wówczas wiedział, kiedy jesteś połączony"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Automatyczny status '_Zaraz wracam' po:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Automatyczny status '_Nieobecny' po:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Połącz automatycznie"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2133,15 +2164,15 @@ msgstr ""
 "Zawsze używaj domyślnych aplikacji KDE\n"
 "Własne"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Automatycznie autoryzuj kontakt"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Automatyczne połączenie po utracie łączności"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2154,13 +2185,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Przed pseudonimem:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Przed czasem:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Przed pseudonimem:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2274,134 +2302,138 @@ msgid "Company:"
 msgstr "Firma:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Konfiguruj _pokój"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Połącz po wciśnięciu przycisku Zakończ"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Połączenie"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Informacje o kontakcie"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "_Informacje o kontakcie"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "Historia rozmowy"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "Kraj:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "Domyślny zestaw ikon _statusu:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Usuń MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Usuń Wiadomość Dnia"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Usuwa Wiadomość Dnia"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Odmów"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Odmów autoryzacji kontaktowi, nie będzie on wówczas wiedział kiedy jesteś "
 "połączony."
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Dział:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Wyświetlaj awatary kontaktów z listy"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Wyświetlaj opisy stutusu kontaktu na liście kontaktów"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "Adres e-mail:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "Co 5 _minut"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Edytuj Grupy"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Zmień informacje o sobie..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Modyfikuj _grupy"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Zarządzaj emotikonami"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Włącz"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Wpisz ponownie nowe hasło:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Wpisz nowe hasło:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Zdarzenia"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "Co 5 _minut"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Dodatkowy adres:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Nazwisko:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Przesyłane pliki."
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "_Przesyłanie plików"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Menadżer plików:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Filtr:"
@@ -2411,39 +2443,35 @@ msgid "Font style:"
 msgstr "Styl czcionki:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Czcionka:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Zabroń mu/jej widzieć twój status"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: RRRR-MM-DD"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Najczęściej Zadawane Pytania (w sieci)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "I_dź"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Wybieranie motywów dla Gajim"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2452,7 +2480,7 @@ msgid ""
 msgstr ""
 "Gajim może wysyłać i odbierać meta-infomacje związane z prowadzoną rozmową"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2460,7 +2488,7 @@ msgstr ""
 "Gajim automatycznie wyświetli nową wiadomość w nowym oknie lub w nowej "
 "karcie otwartego okna rozmowy."
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2469,7 +2497,7 @@ msgstr ""
 "Gajim powiadomi Cię o nadejściu nowej wiadomości wyświetlając okienko w "
 "prawym dolnym rogu ekranu."
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2477,7 +2505,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:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2485,25 +2513,33 @@ msgstr ""
 "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
 "kontaktach które zmieniają status na Rozłączony."
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim zmieni jedynie ikonę kontaktu, który przysłał nową wiadomość."
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kreator Konta"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Ogólne"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Imię:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Żaden"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Grupa:"
@@ -2551,18 +2587,24 @@ msgid "I would like to add you to my contact list."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
 #: ../src/gtkgui.glade.h:170
-msgid "If checked, Gajim will also have a trayicon"
-msgstr "Zaznaczenie spowoduje włączenie ikony Gajima w tacce systemowej."
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
+msgstr ""
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 "Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy kontaktów"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Jeśli jest zaznaczone, Gajim będzie wyświetlał opis statusu kontaktu pod "
 "jego nazwą na liście kontaktów."
@@ -2644,8 +2686,9 @@ msgstr ""
 "kontakty w taki sposób, jakby było to jedno konto."
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Wiadomość otrzymana:"
+#, fuzzy
+msgid "Inactive"
+msgstr "Aktywny"
 
 #. 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:185
@@ -2681,39 +2724,57 @@ msgid "Location"
 msgstr "Miejsce"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Wiadomość"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Zarządzaj..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Zarządzaj kontami"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Zarządzaj zakładkami"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Zarządzaj profilami pośrednika"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Zarządzaj..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Drugie imię:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Więcej"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2721,109 +2782,105 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Pseudonim:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Żaden"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Powiadom mnie o kontaktach zmieniających status na: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "System operacyjny:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "W każdej _wiadomości"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 #, fuzzy
 msgid "One message _window:"
 msgstr "Wyślij wiadomość i zamknij okno"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Otwórz..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Wiadomość wysłana:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "_Hasło:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Hasło"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Zatrzymany"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Informacje osobiste"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Telefon:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Odtwórz _dźwięk"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Stanowisko:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Kod pocztowy:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Ustawienia"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Prefiks:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "nformacja o statusie"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Wyświetlaj czas:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Priory_tet:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2833,59 +2890,51 @@ 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:237
-msgid "Profile, Avatar"
-msgstr "Profil, Awatar"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Protokół:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Pośrednik:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Kreator zapytań..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Ostatnio:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Zarejestruj w"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Usuń konto _tylko z Gajima"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Usuń konto z Gajima i z _serwera"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Usuń przesyłanie tego pliku z listy."
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr "Usuwa zakończone, przerwane i nieudane transfery plików z listy"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Odpowiedz na tę wiadomość"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Wróć do kolorów domyślnych"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "Za_soby: "
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2899,168 +2948,160 @@ msgstr ""
 "'Dom' i 'Praca' w tym samym czasie. Klient o najwyższym będzie odbierał "
 "wiadomości. (patrz niżej)."
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Zasoby:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Funkcja:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Konfiguracja pokoju"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Pokój:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Zapisz _hasło (nie jest to bezpieczne)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr "Zapisz _pozycję i rozmiar okna kontaktów i okna rozmowy"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Zapisz plik jako..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Zapisz _logi rozmów dla wszystkich kontaktów"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Zapisz _hasło"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Search"
 msgstr "_Szukaj"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "_Wyślij"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Wyślij plik"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Wyślij _wiadomość"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Wyślij _plik"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Wyślij _Nową Wiadomość..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Wysyłaj pakiety podtrzymujące"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Wyślij wiadomość"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Wyślij wiadomość i zamknij okno"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 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:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Serwer:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Możliwości serwerów"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Ustaw MOTD"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Ustaw Wiadomość Dnia"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Ustaw _Awatar"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Ustaw awatar po połączeniu"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Ustawia Wiadomość Dnia"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Pokaż wszystkie oczekujące _zdarzenia"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Pokaż kontakty niep_ołączone"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Pokaż _listę kontaktów"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Pokaż Konsolę _XML"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Pokaż tylko _listę kontaktów"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 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:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "_Połączony"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "R_ozłączony"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Sortuj kontakty wydług statusu"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Rozpocznij _rozmowę"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Stan/Województwo:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Informacja o statusie:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Status:"
@@ -3091,25 +3132,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Synch_ronizuj status konta z globalnym statusem"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Motyw:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "_Kolor tekstu:"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "_Czcionka tekstu:"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "Automatyczny status \"Zaraz wracam\""
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "Automatyczny status \"Nieobecny\"."
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Motyw:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3135,50 +3177,56 @@ msgid "Type:"
 msgstr "Typ:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Podkreślenie"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "Ukatualnij MOTD"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Uktualnij Wiadomość Dnia"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Uaktualnia Wiadomość Dnia"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Korzystaj z _SSL"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "Używaj zestawów ikon _transportów"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Używaj autoryzacji"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Użyj własnej nazwy hosta/portu"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "Lista przesyłanych plików"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Ikona w tacce systemowej"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "Identyfikator użytkownika:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Gdy plik w całości zostanie przesłany, wyświetl okno powiadomienia"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3191,21 +3239,21 @@ msgstr ""
 "pojawia się jeśli jest wiadomością od osoby, z którą aktualnie nie "
 "rozmawiasz."
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Gdy odebrane zostanie nowe zdarzenie"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Praca"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3213,415 +3261,454 @@ msgstr ""
 "Musisz posiadać konto aby połączyć się\n"
 " z siecią Jabber."
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Twój JID:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "Dzi_ałania"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "Dod_aj kontakt..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "Dod_aj do listy kontaktów"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "Z_aawansowane"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Po czasie:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Autoryzuj"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "_Tło:"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "Za_banuj"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Przed czasem:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "Dodaj _zakładkę dla tego pokoju"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "Prze_glądarka:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "Widok _zwarty    Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Zawartość"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiuj JID/Adres e-mail"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Kopiuj adres odnośnika"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "O_dmów"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Wyszukuj Usługi"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Wyszukuj Usługi..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Menadżer plików:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Filtr:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Zakończ"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Czcionka:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "_Pokój"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "Podś_wietlaj błędy w pisowni"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_Historia"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Ikona w tacce systemowej"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoruj wiadomości od osób spoza listy kontaktów"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Wiadomość otrzymana:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "_Dołącz do Nowego pokoju..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "Wy_rzuć"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "_Zapisuj historię rozmowy"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "Klient _poczty:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Uczestnik"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "_Połącz konta"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "Wiado_mość"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Modyfikuj"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "_Modyfikuj Konto..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Nazwa: "
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Nigdy"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "Powia_dom mnie o tym"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca."
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "Działania użytk_ownika"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "D_ostępni użytkownicy"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Otwórz Klienta Poczty"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Otwórz Link w przeglądarce"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Otwórz..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Wiadomość wysłana:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "_Właściciel"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Hasło:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Zatrzymaj"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Program odtwarzający dźwięk:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Wyświetl"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Ustawienia"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Obecność"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Publikuj"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Zakończ"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "_Usuń z listy kontaktów"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Odpowiedz"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Wróć do kolorów domyślnych"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Przywróć"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Hasło:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Szukaj"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "_Wyślij"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "_Wyślij i Zamknij"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "_Wyślij prywatną wiadomość"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "_Wyślij wiadomość do serwera"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "_Wyślij wiadomość"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Serwer:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Sortuj kontakty wydług statusu"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "_Rozpocznij rozmowę"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Informacja o statusie:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Autoryzuj"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Autoryzacja"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+msgid "_URL:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Korzystaj z pośrednika"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "_Nazwa użytkownika:"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Głos"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "Konsola _XML..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "Lista przesyłanych plików"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "minutach"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Błąd odczytu pliku:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Błąd przetwarzania pliku:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Nie można zapisywać do %s. Wsparcie dla Menadżera Sesji nie będzie działać"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Szukaj"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Usuń MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Szukaj"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "tworzenie bazy danych z logami"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3630,38 +3717,38 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Przenoszenie Logów..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Data"
@@ -3695,75 +3782,81 @@ msgstr "Obecny status: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Obecny status: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Wiadomość"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Rozpocznij rozmowę z konta %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 #, fuzzy
 msgid "Observers"
 msgstr "Serwer"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Nie możesz dołączyć do pokoju gdy jesteś niewidoczny"
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "_Dołącz do Nowego Pokoju"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Zarządzaj zakładkami..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "do konta %s"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "używając konta %s"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "używając konta %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Zarządzaj zakładkami..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_Historia"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "_Dołącz do Nowego Pokoju"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3771,69 +3864,78 @@ msgstr ""
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
 "tego transportu."
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr "Chciałbym dodać Cię do listy kontaktów"
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "_Zmień nazwę"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "_Połącz"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "R_ozłącz"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "_Zmień Opis Statusu"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana."
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Jeśli \"%s\" zaakceptuje tę prośbę, to będziesz mógł widzieć jego lub jej "
 "status."
 
-#: ../src/roster_window.py:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Teraz \"%s\" zawsze będzie cię widział jako Rozłączonego."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, 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:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
+"będzie zawsze widział Cię jako Rozłączonego."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3841,37 +3943,37 @@ msgstr ""
 "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
 "będzie zawsze widział Cię jako Rozłączonego."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 msgid "I want this contact to know my status after removal"
 msgstr "Chcę żeby po usunięciu ten kontakt znał mój status"
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Wpisz hasło GPG dla konta %s"
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Zapisz hasło"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Hasło"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz się w jednym lub kilku pokojach"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3879,19 +3981,19 @@ msgstr ""
 "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
 "pewno chcesz stać się niewidoczny?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 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:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3899,35 +4001,30 @@ msgstr ""
 "Wiadomości będą dostępne tylko do czytania, o ile masz włączoną obsługę "
 "historii."
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Od %s w pokoju %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Wysyła plik kontaktowi"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Zmień Opis Statusu..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Zmień Opis Statusu..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Ukryj to menu"
 
-#: ../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"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
@@ -3935,7 +4032,7 @@ msgstr[0] "Gajim - %s nieprzeczytana wiadomość"
 msgstr[1] "Gajim - %s nieprzeczytane wiadomości"
 msgstr[2] "Gajim - %s nieprzeczytane wiadomości"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
@@ -3943,7 +4040,7 @@ msgstr[0] "Gajim - %s nieprzeczytana wiadomość"
 msgstr[1] "Gajim - %s nieprzeczytane wiadomości"
 msgstr[2] "Gajim - %s nieprzeczytane wiadomości"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
@@ -3951,7 +4048,7 @@ msgstr[0] "Gajim - %s nieprzeczytana wiadomość"
 msgstr[1] "Gajim - %s nieprzeczytane wiadomości"
 msgstr[2] "Gajim - %s nieprzeczytane wiadomości"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
@@ -3959,96 +4056,88 @@ msgstr[0] "Gajim - %s nieprzeczytana wiadomość"
 msgstr[1] "Gajim - %s nieprzeczytane wiadomości"
 msgstr[2] "Gajim - %s nieprzeczytane wiadomości"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Funkcja: "
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Afiliacja: "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Status: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Zasoby: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Autoryzacja: "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "Domyślny zestaw ikon _statusu:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Rozmiar: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Typ: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Pobieranie"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Prześlij"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Rozmiar: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Typ: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Przesłane: "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Nie włączony"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Ukończony"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Zatrzymany"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Wygaszony"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Przesyłanie"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Ta usługa nie odesłała jeszcze szczegółowych informacji"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4056,33 +4145,33 @@ msgstr ""
 "Ta usługa nie była w stanie odesłać szczegółowych informacji.\n"
 "Prawdopodobnie została zamknięta lub jest zepsuta"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Wybierz awatar"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Obrazki"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "?Klient: Nieznany"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Przeglądanie %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4090,7 +4179,7 @@ msgstr ""
 "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
 "interesujesz się jego/jej statusem."
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4098,12 +4187,12 @@ msgstr ""
 "Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
 "jest zainteresowana twoim."
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Oboje jesteście zaintersowani nawzajem swoimi informacjami o statusie"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4111,23 +4200,23 @@ msgstr ""
 "Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie "
 "jest zainteresowany twoim"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Oczekujesz na odpowiedź kontaktu dotyczącą prośby o autoryzację"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr "Nie możesz wysłać informacji o sobie jeśli nie jesteś połączony."
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "Musisz być połączony by uzyskać informacje o kontakcie."
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 #, fuzzy
 msgid "Personal details"
 msgstr "Informacje osobiste"
@@ -4172,47 +4261,49 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus nie jest obecny na tej maszynie lub brak modułu dla pythona"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "Magistrala sesji nie jest dosŧępna"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Korzystaj z DBus i Demona Powiadomień aby wyświetlać powiadomienia"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Czas w minutach, po którym twój status zostanie zmieniona na Zaraz wracam."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Status Zaraz wracam z powodu bezczynności programu"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Czas w minutach, po którym twój status zostanie zmieniony na Niedostępny."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Status Nieobecny z powodu bezczynności programu"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Jeśli ma wartość True, to */_ nie będą usuwane. Zatem napis *abc* będzie "
 "pogrubiony ale bez usuniętych znaków * *."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Dodać * i [n] do tytułu listy kontaktów?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4220,11 +4311,11 @@ msgstr ""
 "Ile linii z poprzedniej rozmowy powinno zostać zapamiętanych gdy okno/karta "
 "rozmowy zostanie ponownie otwarta."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Ile minut powinny być widoczne linie z poprzedniej rozmowy."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4232,20 +4323,20 @@ msgstr ""
 "Kombinacja Ctrl+Enter wysyła wiadomość a Enter tworzy nową linię (domyślne "
 "zachowanie klienta Mirabilis ICQ)."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ile przechwywać linii dla kombinacji Ctrl+KeyUP."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Używaj widoku zwartego otwierając okno rozmowy"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Korzystaj z widoku zwartego otwierając okno rozmowy w pokoju"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4254,31 +4345,31 @@ msgstr ""
 "Albo własny url zawierający %s, gdzie %s jest słowem/frazą, albo WIKTIONARY, "
 "co oznacza użycie wiktionary."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Jeśli ta opcja jest zaznaczona, to Gajim będzie mógł być sterowany zdalnie z "
 "wykorzystaniem gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4286,24 +4377,24 @@ msgstr ""
 "Nadpisuje host, który wysyłamy w celu przesyłania plików, w przypadku "
 "tłumaczenia adresu/przekierowania portu."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Standard IEC mówi, że KiB = 1024 bajty, KB = 100 bajtów."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Czy pokazywać kartę gdy otwarta jest tylko jedna rozmowa?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr ""
 "Czy pokazywać rozgraniczenie kart jeśli prowadzona jest tylko jedna rozmowa?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4311,7 +4402,7 @@ msgstr ""
 "Lista słów oddzielonych dwukropkami, które będą podświetlane w trakcie "
 "rozmowy w pokoju."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4320,13 +4411,13 @@ msgstr ""
 "Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka "
 "systemowa."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr ""
 "Jeśli ma wartość True, Gajim rejestruje się przy każdym starcie jako klient "
 "xmpp://."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4335,7 +4426,7 @@ msgstr ""
 "nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od "
 "motywu."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4343,7 +4434,7 @@ msgstr ""
 "Jeśli ma wartość True, Gajim wyświetli opis statusu, jeśli nie jest on "
 "pusty, dla każdego kontaktu pod jego nazwą w oknie listy kontaktów."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4352,7 +4443,7 @@ msgstr ""
 "który ostatnio nie miał awatara lub ma zapisany jedynie stary."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4360,20 +4451,20 @@ msgstr ""
 "Jeśli ma wartość False, to nie będziesz widział linii statusu w trakcie "
 "rozmowy, gdy kontakt zmienia swój status i/lub opis statusu."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4384,14 +4475,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Śpię"
@@ -4462,183 +4564,97 @@ msgstr ""
 "jest brana pod uwagę jedynie gdy zmienna notify_on_all_muc_messages ma "
 "wartość True)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "zielony"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "morski"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "czysty"
-
-#: ../src/common/connection.py:68
-#, fuzzy
-msgid "Unable to load idle module"
-msgstr "Nie można dołączyć do pokoju"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Nie można dołączyć do pokoju"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "Aby dołączyć do tego pokoju, wymagane jest hasło."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Zostałeś zabanowany w tym pokoju."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Taki pokój nie istnieje."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "Tworzenie pokoi jest ograniczone."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Twój zarejestrowany pseudonim musi być w użyciu."
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Nie jesteś na liście członków."
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Porządany przez ciebie pseudonim jest używany lub zarejestrowany przez kogoś "
-"innego.\n"
-"Podaj inny pseudonim:"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-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:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "Zapisaliśmy się do %s"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Prośba o cofnięcie autoryzacji od %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "Wypisaliśmy się z %s"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Połączenie z kontem \"%s\"zostało zerwane."
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 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:1464
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"Jid %s nie jest kompatybilny z RFC. Nie zostanie dodany do listy kontaktów. "
-"Skorzystaj z narzędzi do zarządzania listą kontaktów, takich jak http://jru."
-"jabberstudio.org/ aby go usunąć."
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Niepoprawne hasło"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Niepoprawne hasło"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie można połączyć się z \"%s\""
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Połączony z serwerem %s: %s z %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Sprawdź swoje połączenie lub spróbuj później"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autoryzacja z \"%s\" nie powiodła się"
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 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:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "Nie podano klucza OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, 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:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "Niewidoczny"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "Rozłączony"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Jestem %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4647,207 +4663,206 @@ msgstr ""
 "Temat: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Informacje rejestracyjne transportu %s nie dotarły na czas"
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
+msgstr "Chciałbym dodać Cię do listy kontaktów."
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Niepoprawna litera w nazwie użytkownika."
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Wymagany adres serwera."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Niepoprawna litera w nazwie hosta."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Niepoprawna litera w zasobach."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s·GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s·GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s·MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s·MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s·KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s·KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s·B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Zajęty"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "Nie_obecny"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Nieobecny"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "_Chętny do rozmowy"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "_Dostępny"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Dostępny"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "Zaraz _wracam"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Zaraz wracam"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "R_ozłączony"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "N_iewidoczny"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Niewidoczny"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "?contact ma status: Nieznany"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "?contact ma status: Wystąpiły błędy"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "?Posiadane autoryzacje: Brak"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "Do"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "Od"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Obustronna"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "?Poproś (o autoryzację): Brak"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Autoryzuj"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Moderatorzy"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Uczestnicy"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Goście"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Gość"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "robi coś innego"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "pisze wiadomość..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "przerwał pisanie wiadomości"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "zamknął okno lub kartę rozmowy"
 
@@ -4857,10 +4872,107 @@ msgstr "zamknął okno lub kartę rozmowy"
 msgid "error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "czysty"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "cyjan"
 
+#~ msgid "Send"
+#~ msgstr "Wyślij"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr "%(nickname)s·w pokoju·%(room_name)s·przesłał ci nową wiadomość."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s przesłał ci nową wiadomość."
+
+#, fuzzy
+#~ msgid "GUI Migration failed"
+#~ msgstr "Publikacja vCard nie powiodła się"
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "Logi zostały przeniesione do bazy danych."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr "Zaznaczenie spowoduje włączenie ikony Gajima w tacce systemowej."
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Profil, Awatar"
+
+#~ msgid "_Online Users"
+#~ msgstr "D_ostępni użytkownicy"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Rozpocznij rozmowę z konta %s"
+
+#~ 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"
+
+#~ msgid "Size: "
+#~ msgstr "Rozmiar: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "Magistrala sesji nie jest dosŧępna"
+
+#, fuzzy
+#~ msgid "Unable to load idle module"
+#~ msgstr "Nie można dołączyć do pokoju"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Nie można dołączyć do pokoju"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Aby dołączyć do tego pokoju, wymagane jest hasło."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Zostałeś zabanowany w tym pokoju."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Taki pokój nie istnieje."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "Tworzenie pokoi jest ograniczone."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Twój zarejestrowany pseudonim musi być w użyciu."
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Nie jesteś na liście członków."
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "Porządany przez ciebie pseudonim jest używany lub zarejestrowany przez "
+#~ "kogoś innego.\n"
+#~ "Podaj inny pseudonim:"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "Zapisaliśmy się do %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "Prośba o cofnięcie autoryzacji od %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "Wypisaliśmy się z %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "Jid %s nie jest kompatybilny z RFC. Nie zostanie dodany do listy "
+#~ "kontaktów. Skorzystaj z narzędzi do zarządzania listą kontaktów, takich "
+#~ "jak http://jru.jabberstudio.org/ aby go usunąć."
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr "Informacje rejestracyjne transportu %s nie dotarły na czas"
+
 #~ msgid "Sound"
 #~ msgstr "Dźwięk"
 
diff --git a/po/pt/LC_MESSAGES/gajim.po b/po/pt/LC_MESSAGES/gajim.po
index fa9c61d65..294014264 100644
--- a/po/pt/LC_MESSAGES/gajim.po
+++ b/po/pt/LC_MESSAGES/gajim.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Gajim package.
 # 
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -51,7 +51,7 @@ msgid "Hidden"
 msgstr "Escondida"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -68,62 +68,59 @@ msgstr ""
 "A função de destaque de palavras mal soletradas não será usada"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 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/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Conversa"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Conversa"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "Encriptação OpenPGP"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s não emitiu uma chave OpenPGP nem você associou uma"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Encriptação activada"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Encriptação desactivada"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Recebeu uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -131,20 +128,20 @@ msgstr ""
 "Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
 "perdida."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Todos os %s _minutos"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -192,199 +189,212 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Está neste momento ligado ao servidor"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "Para mudar o nome da conta, deve estar disconectado."
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio"
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços"
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve estar no formato \"utilizador@nomedoservidor\"."
 
-#: ../src/config.py:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Tal conta não está disponível"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 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:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 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:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Erro ao receber as chaves secretas"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Nenhuma chave seleccionada"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Registar para %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 #, fuzzy
 msgid "Member List"
 msgstr "_Membro"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 #, fuzzy
 msgid "Owner List"
 msgstr "_Dono"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 #, fuzzy
 msgid "Role"
 msgstr "Função:"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 #, fuzzy
 msgid "Banning..."
 msgstr "Banindo %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -394,77 +404,87 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "Conta \"%s\" está ligada ao servidor"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Se remover isto, a ligação será perdida."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Conta \"%s\" está ligada ao servidor"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Se remover isto, a ligação será perdida."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Nova Sala"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Este bookmark tem dados inválidos"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 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:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 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:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas introduzidas em ambos os campos devem ser idênticas."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Jabber ID Inválido"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Este contacto já se encontra na sua lista de contactos."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "A conta foi adicionada com sucesso"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -473,19 +493,19 @@ msgstr ""
 "tarde clicando no item de menu Contas dentro do menu Editar a partir da "
 "janela principal."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
 
@@ -544,162 +564,161 @@ msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Bindings do python D-Bus estão em falta neste computador"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Nome do Contacto <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Transportes"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Nome do Contacto"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensagem de Estado de %s"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Mensagem de Estado"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor preencha os dados do contacto que deseja adicionar na conta %s"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor preencha os dados do contacto que deseja adicionar"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Transportes"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "ID de Utilizador inválido"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Este serviço não contém quaisquer itens para explorar"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "Um cliente Jabber GTK+"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr "Miguel Fonseca <miguelcsf@gmail.com>"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Pedido de subscrição para a conta %s por parte de %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Pedido de subscrição de %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 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:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar num Chat com a conta %s"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Entrar num Chat"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -708,158 +727,165 @@ msgstr ""
 "de enviar uma mensagem instantânea:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Deve introduzir uma senha."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Nova Mensagem"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Nova Mensagem Instantânea"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Nova Mensagem Privada"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Pedido de Transferência de Ficheiro"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Erro na Transferência de Ficheiro"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Transferência de Ficheiro Completa"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Transferência de Ficheiro Parada"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Pedido de Transferência de Ficheiro"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Erro na Transferência de Ficheiro"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Transferência de Ficheiro Completa"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Transferência de Ficheiro Parada"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "?Função do Contacto no Chat:Nenhuma"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Mensagem Simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Tem de estar ligado para ver os serviços"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviço usando conta %s"
@@ -868,11 +894,11 @@ msgstr "Buscar Serviço usando conta %s"
 msgid "Service Discovery"
 msgstr "Buscar Serviço"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "O serviço não pôde ser encontrado"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -880,175 +906,176 @@ msgstr ""
 "Não há serviço/recurso no endereço que introduziu, ou pelo menos não "
 "responde. Verifique o endereço e tente novamente."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Serviço não explorável"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de serviço/recurso não contém itens para explorar."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "usando a conta %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Este serviço não contém quaisquer itens para explorar"
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "Re_gistar"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Buscando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Utilizadores"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Descrição"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Você"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Guardado em: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Transferência de ficheiro completa"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Abrir Pasta"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Transferência de ficheiro cancelada"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "Ligação ao peer não pode ser estabelecida."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Transferência de ficheiro parada pelo contacto na outra ponta"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Escolher Ficheiro para Enviar"
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Enviar"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "E_nviar"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim não consegue aceder a este ficheiro"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Este ficheiro está a ser usado por outro processo."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Este ficheiro já existe"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Ficheiro: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quer enviar-lhe um ficheiro:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Guardar Ficheiro como..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Deseja sobre-escrevê-lo?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1056,7 +1083,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
@@ -1073,12 +1100,12 @@ msgstr "Ficheiro: "
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar ficheiros vazios"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Remetente: "
 
@@ -1086,32 +1113,32 @@ msgstr "Remetente: "
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Continuar"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "Exibe ajuda acerca de um comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "mostrar ajuda sobre comando"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Mostra ou esconde a janela principal"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Abre uma janela com a próxima mensagem não lida"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1119,45 +1146,45 @@ msgstr ""
 "Mostra uma lista de todos os contactos na lista. Cada contacto aparece numa "
 "linha separada"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "mostrar apenas contactos da conta indicada"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Mostra uma lista de contas registadas"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Muda o estado de uma ou várias contas"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "um de: offline, disponível, livre para conversar, ausente, indisponível, "
 "ocupado, invisível"
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "mensagem"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "mensagem de estado:"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1166,21 +1193,21 @@ msgstr ""
 "estado de todas as contas que têm a opção \"sincronizar com estado global\" "
 "activada"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Mostra uma caixa de conversa para que possa enviar mensagens a um contacto"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contacto com quem deseja conversar"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se especificado, o contacto é escolhido da lista de contactos desta conta"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1190,115 +1217,115 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "conteúdo da mensagem"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "se especificado, a mensagem será encriptada usando esta chave pública"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Envia um ficheiro a um contacto"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "Ficheiro"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Localização do ficheiro"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Exibe todas as preferências e os seus valores"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'chave' para 'valor'."
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'chave' é o nome da preferência, 'valor' é o valor da qual se pretende "
 "definir"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Apaga um item das preferências"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "chave"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a apagar"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escreve o estado actual das preferências do Gajim para o ficheiro .config"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Remove o contacto da lista"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Adiciona o contacto à lista"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Adiciona um novo contacto nesta conta."
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
@@ -1306,16 +1333,16 @@ msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento em falta \"contacto_jid\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1324,16 +1351,16 @@ msgstr ""
 "'%s' não está na sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Versão D-Bus desconhecida: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1342,16 +1369,16 @@ msgstr ""
 "Uso: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1360,7 +1387,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um de:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1369,33 +1396,33 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim necesita do Xserver para ser executado. Saindo..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim necessita do PyGTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr ""
 "Gajim necessita do PyGTK versão 2.6 ou acima para ser executado. Saindo..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim necessita do GTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr ""
 "Gajim necessita do GTK versão 2.6 ou acima para ser executado. Saindo..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Falta suporte libglade para o runtime GTK+"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1404,7 +1431,7 @@ msgstr ""
 "Por favor remova o seu runtime GTK+ actual e instale a última versão estável "
 "de %s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -1412,127 +1439,146 @@ msgstr ""
 "Por favor, certifique-se de que o GTK e o PyGTK têm suporte libglade no seu "
 "sistema."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necessita do PySQLite2 para ser executado"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorização para %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Aceita este pedido?"
 
-#: ../src/gajim.py:498
-#, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "%(nickname)s na sala %(room_name)s enviou-lhe uma nova mensagem."
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Contacto Entrou"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s enviou-lhe uma nova mensagem."
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Contacto Saiu"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Nova Mensagem Privada"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nova Mensagem Instantânea"
+
+#: ../src/gajim.py:610
+#, fuzzy, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nova Mensagem como %s"
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "erro ao enviar"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Autorização aceite"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contacto \"%s\" autorizou-o a ver o seu estado."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contacto \"%s\" removeu a sua subscrição para si"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Vê-lo-á sempre como estando offline."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contacto com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Verifique a sua ligação ou tente novamente mais tarde."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s está agora  %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "A sua chave de acesso está incorrecta"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está neste momento ligado sem a sua chave OpenPGP."
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] "Tem mensagens não lidas"
 msgstr[1] "Tem mensagens não lidas"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Recebeu com sucesso %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Enviou com sucesso %(filename)s para %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de %(filename)s para %(name)s interrompida."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "Publicação vCard deu-se com sucesso"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "As suas informações pessoais foram publicadas com sucesso."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1542,162 +1588,146 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
-#: ../src/gajim.py:1719
-#, fuzzy
-msgid "GUI Migration failed"
-msgstr "Publicação vCard falhou"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "A migração dos registos de conversas (logs) deu-se com sucesso."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management não é suportado (módulo gnome.ui em falta)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Fazendo a 'migração' dos logs..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr ""
 "Por favor, aguarde enquanto que a migração dos seus registos de conversas é "
 "feita "
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Tema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "nome do tema"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Não pode apagar o seu tema actual"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, escolha primeiro outro para o seu tema actual."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Iniciar Conversa"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar Conversa"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, 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/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Chat"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Chat"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Esta sala não tem assunto"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi banido por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s está agora %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s não parece ser um JID válido"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Comando inexistente: /%s (se desejar enviar isto, escreva primeiro /say)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1709,7 +1739,7 @@ msgstr ""
 "pode ser substituida, mas não se conter \"@\". Se o JID estiver neste "
 "momento na sala, este será também expulso. Não suporta espaços numa alcunha."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1717,12 +1747,12 @@ msgstr ""
 "Uso: /%s <alcunha>, abre uma janela de conversa privada com o ocupante "
 "especificado."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, limpa a janela de texto."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1731,12 +1761,12 @@ msgstr ""
 "Uso: /%s [razão], fecha a janela ou aba actual, exibindo a razão se "
 "especificada."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Uso: /%s, muda a janela de chat para o modo compacto."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1745,7 +1775,7 @@ msgstr ""
 "Uso: /%s <JID> [razão], convida o JID para a sala actual, fornecendo "
 "opcionalmente uma razão."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1754,7 +1784,7 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/alcunha], convida a juntar-se a sala@servidor, "
 "usando opcionalmente uma alcunha especificada."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1764,7 +1794,7 @@ msgstr ""
 "Uso: /%s <alcunha> [razão], remove o ocupante especificado pela alcunha da "
 "sala e opcionalmente exibe uma razão. Não suporta espaços na alcunha."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1773,7 +1803,7 @@ msgstr ""
 "Uso: /%s <acção>, envia uma acção para a sala actual. Utilize a terceira "
 "pessoa. (Por exemplo, /%s explode.)"
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1782,87 +1812,87 @@ msgstr ""
 "Uso: /%s <alcunha> [mensagem], abre uma janela de mensagem privada e envia "
 "uma mensagem ao ocupante da sala especificado pela alcunha."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Uso: /%s <alcunha>, muda a sua alcunha na sala actual."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Uso: /%s <message>, envia uma mensagem sem procurar por outros comandos."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Não há informações de ajuda para /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Tem a certeza de que deseja sair da sala \"%s\"?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Se fechar esta janela, perder-se-á a ligação a esta sala."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_Não voltar a perguntar"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Mudar Assunto"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Mudar Alcunha"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Bookmark já está configurado"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "Sala \"%s\" já existe nos seus bookmarks."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Pode gerir os seus bookmarks pelo menu de Acções na sua janela."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Pode especificar uma razão em baixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -1910,111 +1940,120 @@ msgstr "<b>Editor de Configuração Avançada</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Aplicações</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Descrição</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Personalização da Interface</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Tráfego Jabber</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diversos</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Detalhes Pessoais</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Por favor escolha uma das opções abaixo:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Por favor preencha os dados para a sua nova conta</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Por favor escolha uma das opções abaixo:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Propriedades</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Definições</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Sons</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notificações Visuais</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada XML</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Uma lista de transferências de ficheiros activas, completas e paradas"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "_Contas"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Depois da alcunha:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Aceitar"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Conta"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2026,52 +2065,44 @@ msgstr ""
 "Contacto\n"
 "Banner"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Modificação da Conta"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "Acções A_vançadas"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Adicionar Novo Contacto"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Notificações Visuais</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Adicionar _Contacto"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Endereço"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Editor de Configuração Avançada"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Depois da alcunha:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Depois da hora:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2081,57 +2112,57 @@ msgstr ""
 "Apenas compondo uma mensagem\n"
 "Desactivado"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Permitir o envio de informações do _SO "
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Permitir que ele/ela veja o meu estado"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Permitir popup/notificações quando estou _ausente/indisponível/ocupado/"
 "invisível"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "Conhecido também como estilo iChat"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Pedir a mensagem de estado quando eu me: "
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Pedir para ver o estado dele/dela"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Perguntar:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorize o contacto para ele saber quando você está ligado"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Marcar automaticamente como _ausente depois de:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Marcar automaticamente como _indisponível depois de:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Entrar automaticamente"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2143,15 +2174,15 @@ msgstr ""
 "Usar sempre aplicações KDE padrão\n"
 "Personalizar"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Autorizar automaticamente contacto"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Religar automaticamente em caso de perda de ligação."
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2164,13 +2195,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Antes da alcunha:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Antes da hora:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Antes da alcunha:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2288,134 +2316,138 @@ msgid "Company:"
 msgstr "Empresa:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Configurar _Sala"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Ligar quando eu premir Concluir"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Ligação"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Informações do Contacto"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "_Infos do Contacto"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "Histórico das Conversas"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "País:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "Iconset de _estados padrão:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Apagar MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Apagar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Apaga a Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Negar"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Recusar autorização do contacto, para que ele não possa saber quando você "
 "está ligado"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Departamento:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Exibir mensagens de estado dos contactos na lista"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "De 5 em 5 _minutos"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Editar Grupos"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Editar Detalhes Pessoais..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Gerir Emoticons"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Activar"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Introduza novamente para confirmação"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Introduza a nova senha:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Eventos"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "De 5 em 5 _minutos"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Complemento:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Família:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Transferências de Ficheiros"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "_Transferências de Ficheiros"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Gestor de ficheiros:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Filtro:"
@@ -2425,39 +2457,35 @@ msgid "Font style:"
 msgstr "Estilo da letra:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Letra:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Proibí-lo /-la de ver o meu estado"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Questões Perguntadas Frequentemente (FAQ) (online)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "De:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "_Ir"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Personalização de Temas do Gajim"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2467,7 +2495,7 @@ msgstr ""
 "Gajim pode enviar e receber meta-informação relativa a uma conversa que "
 "esteja a ter com um contacto "
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2475,7 +2503,7 @@ msgstr ""
 "Gajim exibirá automaticamente a nova mensagem recebida numa nova janela de "
 "conversa ou numa aba numa janela existente"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2484,7 +2512,7 @@ msgstr ""
 "Gajim o notificará a cada nova mensagem através de um popup no canto "
 "inferior direito do ecrã"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2492,7 +2520,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:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2500,25 +2528,33 @@ 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:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim mudará apenas o ícone do contacto que enviou a nova mensagem"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Criação Passo-a-passo de uma Conta"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Geral"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Nome Dado:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Nenhum"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Grupo:"
@@ -2566,19 +2602,25 @@ msgid "I would like to add you to my contact list."
 msgstr "Gostaria de o adicionar à minha lista de contactos."
 
 #: ../src/gtkgui.glade.h:170
-msgid "If checked, Gajim will also have a trayicon"
-msgstr "Se marcado, o Gajim terá também um ícone na área de notificação"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
+msgstr ""
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Se marcado, Gajim exibirá as mensagens de estado dos contactos debaixo dos "
 "nomes de cada um na janela principal"
@@ -2660,8 +2702,9 @@ msgstr ""
 "os contactos como se tivesse apenas uma conta"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Mensagem recebida:"
+#, fuzzy
+msgid "Inactive"
+msgstr "Activo"
 
 #. 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:185
@@ -2697,39 +2740,57 @@ msgid "Location"
 msgstr "Morada"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Mensagem"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Gerir..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Gerir Contas"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Gerir Bookmarks"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Gerir Perfis de Proxy"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Gerir..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Nome do meio:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Mais"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2737,109 +2798,105 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Alcunha:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "SO:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "Em todas as _mensagens"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 #, fuzzy
 msgid "One message _window:"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Abrir..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Mensagem a enviar:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "_Senha:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Pausada"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Detalhes Pessoais..."
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Telefone:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Porta:"
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Cargo:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Código Postal:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Prefixo:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "mensagem de estado:"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Mostrar hora:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "_Prioridade"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2849,60 +2906,52 @@ 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:237
-msgid "Profile, Avatar"
-msgstr "Perfil, Avatar"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Query Builder..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Recentemente:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Registar para"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Remover conta _apenas do Gajim"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Remover conta do Gajim e do _servidor"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Remover a transferência de ficheiro da lista."
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr ""
 "Remove transferências de ficheiros completas, canceladas e falhadas da lista"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Responder a esta mensagem"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Voltar às Cores Padrão"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "Re_curso: "
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2916,170 +2965,162 @@ msgstr ""
 "recursos 'Casa' e 'Trabalho' ao mesmo tempo. O recurso com a maior "
 "prioridade receberá os eventos. (ver em baixo)"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Função:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Configuração da Sala"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Guardar _frase de acesso (inseguro)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Guardar _posição e tamanho das janelas de conversa e lista de contactos"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Guardar Ficheiro como..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Guardar _históricos das conversas para todos os contactos"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Guardar _senha"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Search"
 msgstr "_Pesquisar"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "_Enviar"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Enviar Ficheiro"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Enviar _Mensagem Simples"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Enviar _Ficheiro"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Enviar _Nova Mensagem..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Enviar pacotes keep-alive"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 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:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Recursos dos Servidores"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Definir MOTD"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Definir a Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Definir _Avatar"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Definir uma imagem pessoal (avatar) quando me ligo"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Define a Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Mostrar Todos os _Eventos Pedentes"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Mostrar Contactos _Offline"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Mostrar _Lista de Contactos"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Mostrar Consola _XML"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Mostrar apenas na _lista"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 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:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "_Ligar"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "_Desligar"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Ordenar contactos por estados"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "Es_tado"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Iniciar _Conversa"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Estado:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Estado"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Mensagem de estado:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Estado:"
@@ -3110,25 +3151,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizar estado da conta com estado global"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Tema:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "_Cor do texto"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "_Letra do texto"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "A mensagem de estado auto-ausente"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "A mensagem de estado auto-indisponível"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Tema:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3154,52 +3196,58 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Sublinhar"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "Actualizar MOTD"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Actualizar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Actualiza a Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (específica)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "Usar iconsets de _transportes"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Usar autenticação"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Usar hostname/porta personalizados"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "lista de transferências de ficheiros"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "ID do Utilizador:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Quando uma transferência de ficheiro é concluida, exibir um popup de "
 "notificação"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3212,21 +3260,21 @@ msgstr ""
 "NOTA: Eventos de nova mensagem recebida só ocorrem se for uma nova mensagem "
 "de um contacto com quem ainda não estiver a conversar."
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Quando um novo evento é recebido"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Trabalho"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3234,414 +3282,453 @@ msgstr ""
 "Necessita de uma conta para se poder ligar\n"
 "à rede Jabber."
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "O seu JID:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Acções"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "_Adicionar Contacto"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "_Adicionar à Lista"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Endereço:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "Avançado"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Depois da hora:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Autorizar"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "Cor _de fundo"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Banir"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Antes da hora:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "Adicionar esta Sala aos _Bookmarks"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "Vista _Compacta    Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "_Copiar JID/Endereço de Email"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Copiar Localização do Link"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Negar"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Descobrir Recursos"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Descobrir Recursos..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Gestor de ficheiros:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Terminar"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Letra:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "C_hat"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal soletradas"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_IC"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 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:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Mensagem recebida:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "_Juntar-se a uma Nova Sala..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "_Histórico das Conversas"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "Cliente de e_mail:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "_Fundir contas"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "_Modificar Conta..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Nome: "
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "_Notificar-me"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificar-me quando uma transferência de ficheiro estiver completa"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "Acções de _Ocupantes"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "Utilizadores _Online"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Abrir Compositor de Email"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Abrir Link no Navegador"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Abrir..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Mensagem a enviar:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "_Dono"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Tocador de som:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Mostrar a mensagem como pop-up"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Presença"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Publicar"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "_Remover da Lista"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Voltar às Cores Padrão"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Recuperar"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Senha:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Pesquisar"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "E_nviar"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "E_nviar & Fechar"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "E_nviar Mensagem Privada"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "E_nviar Mensagem de Servidor"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "E_nviar Mensagem Simples"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Ordenar contactos por estados"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "_Iniciar Conversa"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "E_stado"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Mensagem de estado:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Subscrever"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Subscrição"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+msgid "_URL:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Usar proxy"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "Nome de _utilizador"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Voz"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "Consola _XML..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "lista de transferências de ficheiros"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "minutos"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Erro na leitura do ficheiro:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Erro na interpretação (parsing) do ficheiro:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Impossível escrever para %s. Session Management não será suportado"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Pesquisar"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Apagar MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Pesquisar"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "a criar base de dados dos logs"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3650,36 +3737,36 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Fazendo a 'migração' dos logs..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Data:"
@@ -3713,75 +3800,81 @@ msgstr "O estado é agora: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Estado é agora: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Iniciar conversa com a conta %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Contas fundidas"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Já está na sala %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Não pode entrar numa sala quando está invisível"
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "_Juntar-se a uma Nova Sala"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Gerir Bookmarks..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "usando conta %s"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "usando a conta %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Gerir Bookmarks..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_Histórico"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "_Juntar-se a uma Nova Sala"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3789,67 +3882,76 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para aplicar ao contacto"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "_Ligar"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "_Desligar"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Estado"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, 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:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
+"sempre como offline."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3857,37 +3959,37 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 msgid "I want this contact to know my status after removal"
 msgstr "Quero que este contacto saiba o meu estado depois da remoção"
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Guardar frase de acesso"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar num ou mais chats"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3895,170 +3997,158 @@ msgstr ""
 "Mudar o seu estado para invisível fará com que seja desligado desses chats. "
 "De certeza que deseja tornar-se invisível?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 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:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 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:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "De %s na sala %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Envia um ficheiro a um contacto"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Estado..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Estado..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Esconder este menú"
 
-#: ../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"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %d mensagem não lida"
 msgstr[1] "Gajim - %d mensagens não lidas"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - %d mensagem não lida"
 msgstr[1] "Gajim - %d mensagens não lidas"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - %d mensagem de chat não lida"
 msgstr[1] "Gajim - %d mensagens de chat não lidas"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - %d mensagem privada não lida"
 msgstr[1] "Gajim - %d mensagens privadas não lidas"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Função: "
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Filiação: "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Estado: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Estado: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Subscrição:"
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "Iconset de _estados padrão:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Tamanho: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Tipo: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Tamanho: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Tipo: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Não iniciada"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Parada"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Completa"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Pausada"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Interrompida"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Este serviço/recurso ainda não respondeu com informações detalhadas"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4066,33 +4156,33 @@ msgstr ""
 "Este serviço/recurso não pôde responder com informações detalhadas.\n"
 "Provavelmente está legacy ou broken"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "_Escolher Avatar"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Imagens"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Versão %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4100,7 +4190,7 @@ msgstr ""
 "Este contacto está interessado/a na suas informações de presença, mas você "
 "não está interessado na dele/a"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4108,36 +4198,36 @@ msgstr ""
 "Está interessado nas informações de presença do contacto, mas ele/ela não "
 "está na sua"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Você e o contacto estão interessados nas informações de presença um do outro"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Não está interessado na presença do contacto, nem ele/ela está na sua"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Está à espera da resposta do contacto sobre o seu pedido de subscrição"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "É necessária uma ligação para poder publicar as suas informações de contacto."
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "É necessária uma ligação para receber as suas informações de contacto."
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 #, fuzzy
 msgid "Personal details"
 msgstr "Detalhes Pessoais..."
@@ -4182,45 +4272,47 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus não está presente nesta máquina, ou falta módulo python"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "Sessão bus não está disponível"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Usar DBus e Notification-Daemon para mostrar notificações"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo, em minutos, após o qual o seu estado muda para Ausente."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Ausente por estar inactivo"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo, em minutos, após o qual o seu estado muda para Indisponível."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Indisponível por estar inactivo"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se Verdadeiro (True), não remover */_ . Para que *abc* fique em negrito "
 "(bold) mas * * não seja removido."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no título da lista de contactos?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4228,12 +4320,12 @@ msgstr ""
 "Número de linhas, da conversa anterior, a lembrar para quando uma janela/aba "
 "de conversa seja reaberta."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Número de minutos que as últimas linhas da conversa anterior devem durar."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4241,20 +4333,20 @@ msgstr ""
 "Enviar mensagem ao premir Ctrl+Enter e fazer nova linha com Enter "
 "(Comportamento por defeito do cliente ICQ Mirabilis)."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Número de linhas a guardar ao premir Ctrl+TeclaCIMA."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Usar vista compacta quando uma janela de conversa é aberta"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Usar vista compacta quando uma janela de chat é aberta"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4263,29 +4355,29 @@ msgstr ""
 "Ou um endereço URL personalizado contendo %s, onde %s é a palavra ou frase, "
 "ou 'WIKTIONARY', que significa que será usado o Wiktionary."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Se marcado, Gajim pode ser controlado à distância usando gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4293,23 +4385,23 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "O standart IEC diz: KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando apenas numa conversa?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Mostrar borda da aba quando apenas numa conversa?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4317,7 +4409,7 @@ msgstr ""
 "Uma lista de palavras separadas por ponto-e-vírgula e que serão sublinhadas "
 "num chat de vários utilizadores."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4325,11 +4417,11 @@ msgstr ""
 "Se Verdadeiro (True), sai do Gajim quando o botão X do Window Manager for "
 "clicado. Esta definição só será aplicada se o trayicon estiver a ser usado."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Se Verdadeiro (True), Gajim registará para xmpp:// a cada arranque."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4337,7 +4429,7 @@ msgstr ""
 "Se Verdadeiro (True), Gajim mostrará um ícone em cada aba contendo mensagens "
 "não lidas. Dependendo do tema, este ícone poderá ser animado."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4345,7 +4437,7 @@ msgstr ""
 "Se Verdadeiro (True), Gajim exibirá a mensagem de estado, caso houver, de "
 "cada contacto debaixo do nome de cada um deles na lista"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4354,7 +4446,7 @@ msgstr ""
 "tinha um da última vez ou tenha um na memória cache há demasiado tempo."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4362,20 +4454,20 @@ msgstr ""
 "Se Falso (False), deixará de ver a linha de estados em conversas quando um "
 "contacto mudar de estado ou de mensagem de estado."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4386,14 +4478,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "A dormir"
@@ -4462,183 +4565,98 @@ msgstr ""
 "Som a tocar quando uma mensagem de chat chegar. (Apenas aplicável se "
 "notify_on_all_muc_messages estiver definido como Verdadeiro)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "simples"
-
-#: ../src/common/connection.py:68
-#, fuzzy
-msgid "Unable to load idle module"
-msgstr "Impossível entrar na sala"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Impossível entrar na sala"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "É necessária uma palavra-passe para esta sala."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Está banido/a desta sala."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Tal sala não existe."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "Criação de salas encontra-se restrita."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "A sua alcunha registada tem de ser usada."
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Não está na lista de membros."
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"A alcunha que deseja encontra-se em uso ou registado por outro ocupante.\n"
-"Por favor, introduza outra alcunha em baixo:"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-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:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "estamos agora subscritos a %s"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "pedido de remoção de subscrição por %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "já não estamos subscritos a %s"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 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:1464
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s não é compatível com RFC. Não será adicionado à sua lista. Utilize "
-"ferramentas de gestão de lista (roster) tais como http://jru.jabberstudio."
-"org/ para o remover."
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Senha Inválida"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Senha Inválida"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Ligado ao servidor %s:%s com %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Verifique a sua ligação ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 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:2053
+#: ../src/common/connection.py:486
 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:2055
+#: ../src/common/connection.py:488
 #, 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:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "Invisível"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Estou %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4647,207 +4665,206 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Informação de registo para o transport %s não chegou a tempo"
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
+msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Caractere inválido no nome de utilizador"
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Endereço de servidor necessário."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Caractere inválido no hostname."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Caractere inválido no recurso."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_Indisponível"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Indisponível"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "_Livre para conversar"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Livre para conversar"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "_Disponível"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Disponível"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Ligando"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Ausente"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "In_visível"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "Desconhecido"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "Contém erros"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "Nenhuma"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "Nenhum"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Subscrição"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atenção à conversa"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "está a fazer outra coisa qualquer"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "está a escrever uma mensagem..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "pausa na composição da mensagem"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
@@ -4857,10 +4874,105 @@ msgstr "fechou a janela de conversa ou aba"
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "simples"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "cyan"
 
+#~ msgid "Send"
+#~ msgstr "Enviar"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr "%(nickname)s na sala %(room_name)s enviou-lhe uma nova mensagem."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s enviou-lhe uma nova mensagem."
+
+#, fuzzy
+#~ msgid "GUI Migration failed"
+#~ msgstr "Publicação vCard falhou"
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "A migração dos registos de conversas (logs) deu-se com sucesso."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr "Se marcado, o Gajim terá também um ícone na área de notificação"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Perfil, Avatar"
+
+#~ msgid "_Online Users"
+#~ msgstr "Utilizadores _Online"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Iniciar conversa com a conta %s"
+
+#~ msgid "All contacts in this group are offline or have errors"
+#~ msgstr "Todos os contactos deste grupo estão offline ou têm erros"
+
+#~ msgid "Size: "
+#~ msgstr "Tamanho: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "Sessão bus não está disponível"
+
+#, fuzzy
+#~ msgid "Unable to load idle module"
+#~ msgstr "Impossível entrar na sala"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Impossível entrar na sala"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "É necessária uma palavra-passe para esta sala."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Está banido/a desta sala."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Tal sala não existe."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "Criação de salas encontra-se restrita."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "A sua alcunha registada tem de ser usada."
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Não está na lista de membros."
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "A alcunha que deseja encontra-se em uso ou registado por outro ocupante.\n"
+#~ "Por favor, introduza outra alcunha em baixo:"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "estamos agora subscritos a %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "pedido de remoção de subscrição por %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "já não estamos subscritos a %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s não é compatível com RFC. Não será adicionado à sua lista. Utilize "
+#~ "ferramentas de gestão de lista (roster) tais como http://jru.jabberstudio."
+#~ "org/ para o remover."
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr "Informação de registo para o transport %s não chegou a tempo"
+
 #~ msgid "Sound"
 #~ msgstr "Som"
 
@@ -4996,9 +5108,6 @@ msgstr "cyan"
 #~ msgid "with account "
 #~ msgstr "conta: "
 
-#~ msgid "New Message as %s"
-#~ msgstr "Nova Mensagem como %s"
-
 #~ msgid "Chat with"
 #~ msgstr "Conversa com"
 
diff --git a/po/pt_BR/LC_MESSAGES/gajim.po b/po/pt_BR/LC_MESSAGES/gajim.po
index bd5e5adc1..9eef4fb9d 100644
--- a/po/pt_BR/LC_MESSAGES/gajim.po
+++ b/po/pt_BR/LC_MESSAGES/gajim.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the Gajim package.
 # junix <junix@targetlinux.org>, 2005.
 # 
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.81\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2005-12-11 14:06-0300\n"
 "Last-Translator: Alfredo Jr. (junix) <junix@targetlinux.org>\n"
 "Language-Team: none\n"
@@ -54,7 +54,7 @@ msgid "Hidden"
 msgstr "Escondido"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -71,62 +71,59 @@ msgstr ""
 "Caracteristica de destacar palavras erradas não será usada"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "Uma conexão não está disponível"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 msgid "Your message can not be sent until you are connected."
 msgstr "Sua mensagem não pode ser enviada até que esteja conectado."
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Conversa"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Conversa"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "Criptografia OpenPGP"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s não tem uma chave OpenPGP distribuida e nem você atribuiu uma"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Criptografia habilitada"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Criptografia desabilitada"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Você acabou de receber uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -134,20 +131,20 @@ msgstr ""
 "Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
 "será perdida."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "A cada %s _minutos"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Ativo"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -195,200 +192,213 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP não disponível neste computador"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar disconectado."
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "Para mudar o nome da conta, você deve estar disconectado."
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido:"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 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:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Conta não disponível"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 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:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 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:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Falha enquanto recebia as chaves secretas"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema no recebimento de suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Criptografia OpenPGP"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Nenhuma chave selecionada"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 #, fuzzy
 msgid "Member List"
 msgstr "_Membro"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 #, fuzzy
 msgid "Owner List"
 msgstr "D_ono"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 #, fuzzy
 msgid "Nick"
 msgstr "_Chutar"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 #, fuzzy
 msgid "Role"
 msgstr "Função:"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 #, fuzzy
 msgid "Banning..."
 msgstr "Banindo %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>O que você quer fazer?</b>"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>O que você quer fazer?</b>"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>O que você quer fazer?</b>"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>O que você quer fazer?</b>"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -398,77 +408,87 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "Conta \"%s\" está conectada ao servidor"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Se você remover-lo, a conexão será perdida."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Conta \"%s\" está conectada ao servidor"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Se você remover-lo, a conexão será perdida."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Nova Sala"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Bookmark tem dados inválidos"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 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:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para configurar esta conta."
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 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:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas digitadas em ambos os campos devem ser idênticas."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Jabber ID Inválido:"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Este contato já encontra-se em sua lista."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -477,19 +497,19 @@ msgstr ""
 "Avançado, ou mais tarde clicando em Contas no item de menu da janela "
 "principal."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
@@ -548,164 +568,163 @@ msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Acesso ao python D-Bus foi perdido neste computador"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Nome do Contato <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Transportes"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Nome do Contato"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Mensagem de status"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Mensagem de status"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Mensagens de Status Disponíveis</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Escreve sua nova mensagem de status:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, preencha os dados do contato se você quer adicionar na conta %s"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor preencha os dados do contato que você quer adicionar"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Transportes"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "Inválido ID do usuário"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Este serviço não contém nenhum item para navegar."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Contato já foi adicionado à lista"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Este contato já encontra-se em sua lista."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "Um cliente jabber GTK+"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr ""
 "Alfredo Jr. - Junix <junix@infolink.com.br> e Juracy Filho <juracy@gmail.com>"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Solicitação de inscrição para conta %s de %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitação de inscrição de %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 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:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ingressar numa conferência com a conta %s"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "Nome de usuário inválido"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar uma conferência com a conta %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -714,158 +733,165 @@ msgstr ""
 "enviar uma mensagem:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, 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:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar contectado para mudar sua senha"
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Nova Mensagem"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Nova Mensagem"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Enviar Mensagem Privada"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Solicitação de Transferência de Arquivos"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Erro na Transferência de Arquivos"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Transferência do Arquivo Completa"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Transferência do Arquivo Parada"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Solicitação de Transferência de Arquivos"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Erro na Transferência de Arquivos"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Transferência do Arquivo Completa"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Transferência do Arquivo Parada"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "?Regra do Contato para Conversa em Grupo:Nenhuma"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Mensagem simples com conta %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Mensagem simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML para %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "Console XML"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "Convidado %(contact_jid)s para %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Você deve estar conectado para visualizar os serviços disponíveis"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviços usando conta %s"
@@ -874,11 +900,11 @@ msgstr "Buscar Serviços usando conta %s"
 msgid "Service Discovery"
 msgstr "Buscar Serviços"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "O serviço não pode ser encontrado"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -886,175 +912,176 @@ msgstr ""
 "Não existe serviço para o endereço que você entrou, ou não está respondendo. "
 "Verifique o endereço e tente novamente."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Serviço não navegável"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de serviço não contém nenhum item para navegar."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "usando conta %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Este serviço não contém nenhum item para navegar."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Ingressar"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Buscando %d / %d"
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Usuários"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Descrição"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Arquivo"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do arquivo: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Você"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Salvo em: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Transferência de arquivos completa"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Abrir pasta do arquivo"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Transferência de arquivos cancelada"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "Conexão ponto a ponto peer não pôde ser estabelecida."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Transferência de arquivo parada pelo contato do outro lado"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Escolha o Arquivo para Enviar..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Enviar"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "_Enviar"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim não pode acessar este arquivo"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Este arquivo está sendo usado por outro processo."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>O que você quer fazer?</b>"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Arquivo: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Salvar Arquivo como..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Você gostaria de sobreescrevê-lo?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1062,7 +1089,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
@@ -1079,12 +1106,12 @@ msgstr "Arquivo:"
 msgid "It is not possible to send empty files"
 msgstr "não é possível enviar arquivos vazios"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Remetente: "
 
@@ -1092,32 +1119,32 @@ msgstr "Remetente: "
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Continuar"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "mostrar ajuda para um comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "mostrar ajuda no comando"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Mostrar ou esconder a janela principal"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Mostrar uma janela com a próxima mensagem não lida"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1125,44 +1152,44 @@ msgstr ""
 "Imprimir uma lista de todos os contatos na lista. Cada contato aparecerá em "
 "uma linha separada"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "mostrar somente os contatos desta conta"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Imprimir uma lista das contas registradas"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Mudar o status da conta ou contas"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "um desses: desconectado, conectado, bate-papo, inativo, fora, np, invisível"
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "mensagem"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "mensagem de status"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1171,21 +1198,21 @@ msgstr ""
 "status de todas as contas existentes com a opção \"sincronizar com status "
 "global\" marcada"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Mostrar o diálogo do bate-papo onde você pode enviar mensagens para um "
 "contato"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contato que você quer conversar"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "se especificado, o contato é feito da lista de contatos desta conta"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1195,126 +1222,126 @@ msgstr ""
 "conta são opcionais. Se vc quer configurar somente a 'conta', sem a 'chave "
 "pgp', apenas configure a 'chave pgp' para ''."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contato que irá receber a mensagem"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "conteúdos da mensagem"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "se especificada, a mensagem será criptografada usando esta chave pública"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificada, a mensagem será enviada usando esta conta"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Informações detalhadas do contato"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID do contato"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Informações detalhadas do contato"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Você não tem uma conta ativa"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Enviar arquivo para um contato"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "arquivo"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Caminho do arquivo"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "se especificada, arquivo irá ser enviado usando esta conta"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Lista todas as preferências e seus valores"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ajusta o valor da 'chave' ao 'valor '."
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'chave' é o nome de preferência, 'valor' é o valor para ajustá-la"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Deleta um item de preferência"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "chave"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a ser deletado"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Escreve o estado atual das preferências do Gajim em um arquivo .config"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Remover contato da lista"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Adicionar contato para a lista"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Adicionar novo contato para esta conta"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Retorna o status atual (global a menos que o cliente for especificado)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr "Retorna o status atual (global a menos que o cliente for especificado)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Você tem mensagens não lidas"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento não informado \"contact_jid\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1323,16 +1350,16 @@ msgstr ""
 "'%s' não está em sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Você não tem uma conta ativa"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Versão dbus desconhecida: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1341,16 +1368,16 @@ msgstr ""
 "Uso: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1359,7 +1386,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um desses:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1368,31 +1395,31 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Tipo \"%s ajuda %s\" para maiores informações"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim necessita do Xserver para rodar. Encerrando..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim necessita PyGTK 2.6 ou acima"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim necessita PyGTK 2.6 ou acima para rodar. Encerrando..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim necessita GTK 2.6 ou acima"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim necessita GTK 2.6 ou acima para rodar. Encerrando..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Não existe suporte para libglade no GTK+ runtime"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1401,7 +1428,7 @@ msgstr ""
 "Por favor remova seu GTK+ runtime atual e instale a última versão estável de "
 "%s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -1409,127 +1436,146 @@ msgstr ""
 "Por favor certifique-se de que o gtk e o pygtk têm suporte ao libglade em "
 "seu sistema."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necessita de PySQLite2 para rodar"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autorização HTTP (%s) para %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Você aceita a solicitação?"
 
-#: ../src/gajim.py:498
-#, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "%(nickname)s na sala %(room_name)s lhe enviou uma nova mensagem."
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Contato conectou"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s lhe enviou uma nova mensagem."
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Contato desconectou"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Enviar Mensagem Privada"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nova Mensagem"
+
+#: ../src/gajim.py:610
+#, fuzzy, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nova Mensagem como %s"
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "erro no envio"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contato \"%s\" autorizou você para ver seu status."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contato \"%s\" removeu sua inscrição"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Você sempre o verá como offline."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contato com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Verifique sua conexão ou tente novamente mais tarde."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s agora está %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Sua frase de acesso está incorreta"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Você está atualmente conectado sem sua chave OpenPGP."
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] "Você tem mensagens não lidas"
 msgstr[1] "Você tem mensagens não lidas"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Você recebeu com sucesso %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Você enviou com sucesso o %(filename)s a %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de arquivo de %(filename)s to %(name)s parado."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "Publicação do vCard bem sucedida"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Suas informações pessoais foram publicadas com sucesso."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "Publicação do vCard falhou"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1538,162 +1584,146 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: ../src/gajim.py:1719
-#, fuzzy
-msgid "GUI Migration failed"
-msgstr "Publicação do vCard falhou"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "Os logs foram migrados com sucesso à base de dados."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Suporte de gerenciamento da sessão não disponível (faltando o módulo gnome."
 "ui)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Migrando Logs..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Espere por favor, enquanto os registros estão sendo migrados..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Tema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "nome do tema"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Você não pode apagar o seu tema corrente"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Por favor escolha outro para seu tema corrente."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar conversa"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Falha ao Enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, 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/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Conferência"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Conferência"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Esta sala não tem assunto"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi chutado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s  foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s  foi banido por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s agora está %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Apelido não encontrado: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Convidado %(contact_jid)s para %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s não parece ser um JID válido"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Comando não encontrado: /%s (se você quer enviar use este prefixo /say)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1706,7 +1736,7 @@ msgstr ""
 "atualmente na sala, ele/ela será chutado também.  Não suporta espaços no "
 "apelido."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1714,12 +1744,12 @@ msgstr ""
 "Uso: /%s <apelido>, abre uma janela de conferência privada para um ocupante "
 "específico."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, apaga o texto da janela."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1728,12 +1758,12 @@ msgstr ""
 "Uso: /%s [rasão], fecha a janela corrente ou a aba, mostrando a razão se "
 "especificada."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Uso: /%s, configura a janela de conferência para modo compacto."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1742,7 +1772,7 @@ msgstr ""
 "Uso: /%s <JID> [ razão ], convida JID à sala atual, fornecendo opcionalmente "
 "uma razão."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1751,7 +1781,7 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/apelido], oferece para entrar na sala@servidor "
 "opcionalmente usando um apelido específico."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1761,7 +1791,7 @@ msgstr ""
 "Uso: /%s <apelido> [razão], remove o ocupante especificado pelo apelido da "
 "sala e indica opcionalmente uma razão.  Não suporta espaços no apelido."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1770,7 +1800,7 @@ msgstr ""
 "Uso: /%s <ação>, emite a ação à sala atual. Use a terceira pessoa (por "
 "exemplo: /%s explodes.)"
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1779,88 +1809,88 @@ msgstr ""
 "Uso: /%s <apelido> [ mensagem ], abre uma janela de mensagem privada e envia "
 "uma mensagem ao ocupante especificado pelo apelido."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Uso: /%s <apelido>, muda seu apelido na sala corrente."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Uso: /%s [tópico], mostra ou atualiza o tópico da sala atual."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Uso: /%s <mensagem>, envia uma mensagem sem procurar por outros comandos."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Sem ajuda para /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Você tem certeza que quer deixar a sala \"%s\"?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Se você fechar esta janela, você será desconectado desta sala."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "Não _me pergunte novamente"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Mudando Assunto"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Mudando Apelido"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique o novo apelido que você quer usar:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Bookmark já configurado"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "Sala \"%s\" já existe nos bookmarks."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Você pode gerenciar seus bookmarks pelo menu de Ações na janela principal."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -1906,111 +1936,120 @@ msgstr "<b>Editor de Configurações Avançadas</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Aplicações</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Customizar</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Descrição</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Formato da linha</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Customização de interface</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Trafégo do Jabber</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diversos</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informações Pessoais</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Por favor escolha uma das opções abaixo:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Por favor preencha os dados para sua nova conta</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Por favor escolha uma das opções abaixo:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Mensagens de Status Disponíveis</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Propriedades</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Configurações</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Sons</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Escreve sua nova mensagem de status:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notificações Visuais</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>O que você quer fazer?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada XML</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Uma lista de transferência de arquivos ativas, completadas e paradas"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "_Contas"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Depois do apelido:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "Sobre"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Aceitar"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Conta"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2022,52 +2061,44 @@ msgstr ""
 "Contato\n"
 "Faixa"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Modificação da Conta"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "_Ações Avançadas"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Adicionar Novo Contato"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Notificações Visuais</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Adicionar _Contato"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Endereço"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Editor de Configurações Avançadas"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Depois do apelido:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Depois da hora:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2077,56 +2108,56 @@ msgstr ""
 "Escrevendo somente\n"
 "Desabilitado"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Permitir o envio de informações do _SO "
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Permita que ele/ela ver meu status"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Permite janela/notificação quando eu estou _afastado/NA/ocupado/invisível"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "Conhecido também como estilo iChat"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Solicite uma mensagem de status quanto eu:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Peça para ver o status dele/dela"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Perguntar:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorize o contato para que ele saiba quando você estiver conectado"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Marcar como _afastado depois:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Marcar como _afastado depois:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Ingresso automático"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2138,15 +2169,15 @@ msgstr ""
 "Sempre usar aplicações padrão KDE\n"
 "Customizar"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Autorizar automaticamente os contatos"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Reconectar automaticamente quando a conexão cair"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2159,13 +2190,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Antes do apelido:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Antes da hora:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Antes do apelido:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2283,134 +2311,138 @@ msgid "Company:"
 msgstr "Empresa:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Configurar _Sala"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Conectar quando eu pressiono Fim"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Conexão"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Informações do Contato"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "_Informações de Contato"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "Histórico de Conversação"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "País:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "Conjunto de ícones de status padrão:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Deletar MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Deletar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Deletar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Negar"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Negando a autorização do contato, ele não poderá saber quando você está "
 "conectado"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Departamento:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Mostrar avatar dos contatos na lista"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Mostrar mensagem de status da lista de contato"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "De 5 em 5 _minutos"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Editar Grupos"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Editar detalhes pessoais..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Gerenciar Emoticons"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Habilitar"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Entre novamente para confirmação:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Entre com a nova senha:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Eventos"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "De 5 em 5 _minutos"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Complemento:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Família:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Transferência de Arquivos"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "Transferência de _Arquivos"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Gerenciamento de arquivos:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Filtro:"
@@ -2420,39 +2452,35 @@ msgid "Font style:"
 msgstr "Estilo da fonte:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Fonte:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Proibir ele/ela a ver meu status"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Perguntas freqüentes (online)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "De:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "_Ir"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Customização de Temas do Gajim"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2462,7 +2490,7 @@ msgstr ""
 "Gajim pode enviar e receber meta-informações relacionadas a conversação que "
 "você pode ter com um contato"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2470,7 +2498,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:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2479,7 +2507,7 @@ msgstr ""
 "Gajim notificará você de uma nova mensagem via uma alerta visual na lateral "
 "inferior direita da tela"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2487,7 +2515,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:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2495,25 +2523,33 @@ 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:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim somente mudará o ícone do contato que enviou a nova mensagem"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Auxíliar de Configuração de Conta"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Geral"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Nome:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Nenhum"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Grupo:"
@@ -2561,17 +2597,23 @@ 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:170
-msgid "If checked, Gajim will also have a trayicon"
-msgstr "Se marcado, o Gajim também terá um ícone de bandeja"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
+msgstr ""
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr "Se checado, Gajim mostrará os avatares dos contatos na janela da lista"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Se verificado, Gajim indicará mensagens de status dos contatos sob o nome do "
 "contato na janela da lista"
@@ -2653,8 +2695,9 @@ msgstr ""
 "contatos como se você tivesse somente uma conta"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Mensagem recebida:"
+#, fuzzy
+msgid "Inactive"
+msgstr "Ativo"
 
 #. 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:185
@@ -2690,39 +2733,57 @@ msgid "Location"
 msgstr "Endereço"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Mensagem"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Gerenciar..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Gerenciar Contas"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Gerenciar Bookmarks"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Gerenciar Perfis de Proxy"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Gerenciar..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Nome do meio:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Mais"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2730,109 +2791,105 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Apelido:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Notifique-me sobre contatos ao: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "SO:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "Em todas as _mensagens"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 #, fuzzy
 msgid "One message _window:"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Abrir..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Mensagem enviada:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "_Senha:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Pausa"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Informações Pessoais"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Telefone:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Porta:"
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Cargo:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Código Postal:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Prefixo:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "mensagem de status"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Imprimir tempo:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "_Prioridade"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2842,61 +2899,53 @@ 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:237
-msgid "Profile, Avatar"
-msgstr "Perfil, Avatar"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Gerador de consultas..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Recentemente:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Registrar para"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Remover conta _somente do Gajim"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Remover conta do Gajim e do _servidor"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Remover a transferência de arquivo da lista."
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr ""
 "Remover transferências de arquivos completas, canceladas ou interrompidas da "
 "lista"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Resposta para esta mensagem"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Voltar para as Cores Padrões"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "_Recurso: "
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2910,168 +2959,160 @@ msgstr ""
 "com o recurso 'Casa' e 'Trabalho' ao mesmo tempo. O recurso que possuir a "
 "maior prioridade receberá os eventos. (veja abaixo)"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Função:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Configuração da Sala"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Salvar _frase de acesso (inseguro)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr "Salvar _posição e tamanho das janelas de conversa e lista de contatos"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Salvar Arquivo como..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Salvar histórico para todos os contatos desta conta"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Salvar senha"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Search"
 msgstr "_Buscar"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "E_nviar"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Enviar arquivo"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Enviar _Mensagem Simples"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Enviar _Arquivo"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Enviar _nova Mensagem..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Enviar pacotes para manter a conexão (keep-alive)"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 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:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Recursos dos Servidores"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Configurar MOTD"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Configurar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Configurar _Avatar"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Configura avatar quando eu conectar"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Configurar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Mostrar todos _Eventos Pendentes"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Mostrar Contatos desc_onectados"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Mostre _Lista"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Mostrar console _XML"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Mostre somente na _lista"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 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:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "_Conectar"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Ordena contatos pelo status"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Estado:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Mensagem de status:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Status:"
@@ -3102,25 +3143,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "_Sincronizar status da conta com status global"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Tema:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "_Cor do texto"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "_Fonte do texto"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "A mensagem de status para o ausente automático"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "A mensagem de status para o afastado automático"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Tema:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3146,50 +3188,56 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Sublinhar"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "Atualizar MOTD"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Atualiza Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Atualizar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (obsoleto, apenas para servidores antigos)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "Usar conjunto de ícones de _transportes"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Usar autenticação"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Usa nomedohost/porta customizada"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "lista de transferência de arquivos"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "Í_cone na bandeja (também conhecido por área de notificação)"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "ID do Usuário:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Mostrar um alerta visual quanto uma transferência de arquivo terminar"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3202,21 +3250,21 @@ msgstr ""
 "NOTA:  Os eventos novos de mensagem ocorrem somente se for uma mensagem nova "
 "de um contato que você não conversou"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Quando novo evento é recebido"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Trabalho"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3224,415 +3272,454 @@ msgstr ""
 "Você precisa ter uma conta para conectar na\n"
 "rede Jabber."
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Seu JID:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Ações"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "_Adicionar Contato..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "_Adicionar à Lista"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Endereço:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Administração"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Depois da hora:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Autorizar"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "Cor _de fundo"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Banir"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Antes da hora:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "Adicionar esta Sala ao _Bookmark"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Navegar:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "Visão _Compacta    Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Índices"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "_Copiar Endereço de Email/JID"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Copia Localização do Link"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Negar"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Descubra Serviços"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Descubra Serviços..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Gerenciamento de arquivos:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Encerrar"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Fonte:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "_Conferência"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal escritas"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "Í_cone na bandeja (também conhecido por área de notificação)"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 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:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Mensagem recebida:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "_Ingressar Nova Sala..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "_Chutar"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "_Histórico de Conversação"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "_Log mudanças de status dos contatos"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "_Cliente de email:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "_Juntar contato das contas"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "_Editar Conta..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Nome: "
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "_Notifique-me sobre isto"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificar-me quando a transmissão do arquivo terminar"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "Ações de _Ocupantes"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "Usuários C_onectados"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Abrir Cliente de E-mail"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Abrir link no Navegador"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Abrir..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Mensagem enviada:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "D_ono"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Tocador de som:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Alerta visual"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Presença"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Publicar"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "_Remover da Lista"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Voltar para as Cores Padrões"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Recuperar"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Senha:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Buscar"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "_Enviar"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "_Enviar & Fechar"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "_Enviar Mensagem Privada"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "_Enviar Mensagem pelo Servidor"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "_Enviar uma Mensagem Simples"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Ordena contatos pelo status"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "_Iniciar conversa"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Mensagem de status:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Inscrever"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Inscrição"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+msgid "_URL:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Usar proxy"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "Nome do _usuário"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Voz"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "Console _XML..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "lista de transferência de arquivos"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "minutos"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Erro lendo arquivo:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Erro ao analisar gramaticalmente o arquivo:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Não foi possível escrever à %s. O suporte de gerência da sessão não funciona"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Buscar"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Deletar MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Buscar"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "criando banco de dados de logs"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3641,36 +3728,36 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Migrando Logs..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Data:"
@@ -3704,142 +3791,157 @@ msgstr "Status agora é: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status agora é: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Iniciar uma conferência com a conta %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Você já está na sala %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Você não pode ingressar em uma sala enquanto está invisível"
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "_Ingressar na Nova Sala"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Gerenciar Bookmarks..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "para %s conta"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "usando %s conta"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "usando conta %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Gerenciar Bookmarks..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_Histórico"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "_Ingressar na Nova Sala"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 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 deste transporte"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de adiciona-lo à minha lista"
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "_Conectar"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Status"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" aceitar esta solicitação, você saberá o status dele ou dela."
 
-#: ../src/roster_window.py:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Removendo este contato, você também, por padrão, removerá a autorização, "
+"resultando em ele ou ela sempre o verá offiline."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3847,37 +3949,37 @@ msgstr ""
 "Removendo este contato, você também, por padrão, removerá a autorização, "
 "resultando em ele ou ela sempre o verá offiline."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 msgid "I want this contact to know my status after removal"
 msgstr "Eu quero que este contato saiba meu status após a remoção"
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Frase de acesso é obrigatória"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Entre com a chave GPG para conta %s"
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Salvar Frase de acesso"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Você está participando em uma ou mais conferências"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3885,20 +3987,20 @@ msgstr ""
 "Mudando seu status para invisível resulta na desconexão daquelas "
 "conferências.  Você tem certeza que quer ir invisível?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 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:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3906,151 +4008,139 @@ msgstr ""
 "Mensagem somente estará disponível para leitura mais tarde se você tiver o "
 "histórico habilitado."
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "De %s na sala %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Enviar arquivo para um contato"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Status..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Status..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Esconder este menu"
 
-#: ../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"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - uma mensagem não lida"
 msgstr[1] "Gajim - %d mensagens não lidas"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - %d mensagem simples não lida"
 msgstr[1] "Gajim - %d mensagens simples não lidas"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - %d mensagem de conferência não lida"
 msgstr[1] "Gajim - %d mensagens de conferência não lidas"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - %d mensagem privada não lida"
 msgstr[1] "Gajim - %d mensagens privadas não lidas"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Regra: "
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Filiação: "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Status: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Inscrição: "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "Conjunto de ícones de status padrão:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Tamanho: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Tipo: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Tamanho: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Tipo: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Não iniciado"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Parado"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Completo"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Pausa"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Parado"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Transferindo"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Este serviço não respondeu ainda com informação detalhada"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4058,33 +4148,33 @@ msgstr ""
 "Este serviço não poderia responder com informações detalhadas.\n"
 "É mais provável quebrado"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "_Escolha o Avatar"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Imagens"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Navegando %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4092,7 +4182,7 @@ msgstr ""
 "Este contato está interessado em sua informação de presença, mas você não "
 "está interessado napresença dele/dela"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4100,13 +4190,13 @@ msgstr ""
 "Você está interessado na informação da presença do contato, mas ele/ela não "
 "está interessado em seu"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Você e o contato estão interessados em cada outra informação da presença"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4114,24 +4204,24 @@ msgstr ""
 "Você não está interessado na presença do contato, e nenhum está interessado "
 "no seu"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Você está esperando a resposta do contato sobre seu pedido da subscrição"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr "Você deve estar conectado para publicar suas informações de contato."
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "Você deve estar conectado para receber suas informações de contato."
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 #, fuzzy
 msgid "Personal details"
 msgstr "Informações Pessoais"
@@ -4176,45 +4266,47 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus não está presente nesta máquina o módulo python está faltando"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "Sessão bus não está disponível"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Use DBus e Notification-Daemon para mostrar notificações"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Minutos, depois do qual seu status mudam a afastado."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Afastado em conseqüência de estar inativo"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Minutos, depois do qual seu status mudam a nao disponível."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Não disponível em conseqüência de estar inativo"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se verdadeiro, não remova */_. Assim * ABC * seja negrito(realce) mas com * "
 "* não removido."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no arquivo de lista?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4222,12 +4314,12 @@ msgstr ""
 "Quantas linhas para lembrar da conversação precedente quando uma aba/janela "
 "de bate-papo for reaberto."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Quantos minutos devem durar linhas do último precedente da conversação."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4235,20 +4327,20 @@ msgstr ""
 "Enviar a mensagem com Ctrl+Enter e com entram fazem a linha nova "
 "(comportamento padrão do cliente ICQ da Mirabilis)."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Quantas linhas à armazenar para Ctrl+KeyUP."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Usar visão compacta quando você abre a janela de bate-papo"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Use a vista compacta quando você abre uma janela de conferência"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4257,30 +4349,30 @@ msgstr ""
 "Um ou outro URL costuma vir com o %s nele onde %s é a palvra/frase ou ' em "
 "WIKTIONARY ' que significam o uso wiktionary."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se verificado, Gajim pode ser remotamente controlado usando gajim-remoto."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar um aba ou janela de conferência."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Perguntar antes de fechar um aba ou janela de conferência."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Perguntar antes de fechar um aba ou janela de conferência."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4288,23 +4380,23 @@ msgstr ""
 "Cancela o host que nos enviou um transferência de arquivo caso que foi "
 "direcionado do endereço tradução/porta."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Padrão da IEC diz que KiB = 1024 bytes e KB = 1000 bytes."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando tiver apenas uma bate papo?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Mostrar borda da aba com apenas um bate papo?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4312,7 +4404,7 @@ msgstr ""
 "Uma lista semicolon-separada das palavras que serão destacadas no bate-papo "
 "multi-user."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4320,11 +4412,11 @@ msgstr ""
 "Se verdadeiro, o Gajim sairá quando o botão sair da janela for clicado. Esta "
 "opção só faz sentido quando a opção trayicon está sendo usada."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Se verdadeiro, Gajim registra-se para xmpp:// a cada inicialização."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4332,7 +4424,7 @@ msgstr ""
 "Se verdadeiro, Gajim mostrará um ícone para cada aba contendo mensagens não "
 "lidas. Dependendo do tema, este ícone pode ser animado."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4340,7 +4432,7 @@ msgstr ""
 "Se verdadeiro, Gajim indicará a mensagem de status, se não, esvazía-a, para "
 "cada contato sob o nome do contato na janela da lista"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4349,7 +4441,7 @@ msgstr ""
 "ou tem um cache que é velho demais."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4357,20 +4449,20 @@ msgstr ""
 "Se falso, você verá não mais por muito tempo a linha de status nos bate-"
 "papos quando um contato muda seu ou seu status e/ou sua mensagem do status."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4381,14 +4473,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Dormindo"
@@ -4457,183 +4560,98 @@ msgstr ""
 "Som para tocar quando qualquer mensagem MUC chegar. (este ajuste é feito "
 "exame no cliente somente se os notify_on_all_muc_messages for verdadeiro)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "mantimento"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "marinho"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "plano"
-
-#: ../src/common/connection.py:68
-#, fuzzy
-msgid "Unable to load idle module"
-msgstr "Impossível ingressar na sala"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Impossível ingressar na sala"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "Uma senha é requerida para entrar nesta sala."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Você está banido desta sala."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Tal sala não existe."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "A criação de sala é restrita."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Seu nickname registado deve ser usado."
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Você não está na lista de membros."
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Seu nickname desejado está em uso ou registado por um outro usuário.\n"
-" Por favor, especifique um outro nickname abaixo:"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-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:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "nós estamos agora inscritos para %s"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "Remoção de Inscrição solicitada por %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "nós estamos agora sem inscrição para %s"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Conexão com a conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 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:1464
-#, fuzzy, 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 ""
-"O Jid %s não é uma compilação da RFC. Não se adicionará a sua lista.  Use "
-"ferramentas de gerência da lista como http://jru.jabberstudio.org/ para "
-"removê-lo"
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Senha Inválida"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Senha Inválida"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível conectar a \"%s\""
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Conectado ao servidor %s:%s com %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Verifique sua conexão ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 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:2053
+#: ../src/common/connection.py:486
 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:2055
+#: ../src/common/connection.py:488
 #, 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:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "invisível"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "desconectado"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Eu estou %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Esta mensagem está criptografada]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4642,207 +4660,206 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "A informação do registo para o transporte %s não chegou a tempo"
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
+msgstr "Eu gostaria de adiciona-lo à minha lista."
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Caracter inválido no nome do usuário"
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Endereço do servidor é requerido."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Caracter inválido no nome do host"
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Caracter inválido no recurso."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_Não Disponível"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Não Disponível"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "Livre para _Conversa"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Livre para Conversa"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "Dis_ponível"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Disponível"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "_Afastado"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Afastado"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "_Desconectado"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "_Invisível"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "?contato tem status:Desconhecido"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "?contato tem status:Com erros"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "?Inscrição existente:Nenhuma"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "De"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "?Pergunta (para Inscrição):Nenhuma"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Inscrever"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "?Regra do Contato para Conversa em Grupo:Nenhuma"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "está prestando a atenção na conversa"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "está fazendo outra coisa"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "está escrevendo uma mensagem..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "pausa na digitação da mensagem"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
@@ -4852,10 +4869,105 @@ msgstr "fechou a janela de conversa ou aba"
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "plano"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "ciano"
 
+#~ msgid "Send"
+#~ msgstr "Enviar"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr "%(nickname)s na sala %(room_name)s lhe enviou uma nova mensagem."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s lhe enviou uma nova mensagem."
+
+#, fuzzy
+#~ msgid "GUI Migration failed"
+#~ msgstr "Publicação do vCard falhou"
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "Os logs foram migrados com sucesso à base de dados."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr "Se marcado, o Gajim também terá um ícone de bandeja"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Perfil, Avatar"
+
+#~ msgid "_Online Users"
+#~ msgstr "Usuários C_onectados"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Iniciar uma conferência com a conta %s"
+
+#~ msgid "All contacts in this group are offline or have errors"
+#~ msgstr "Todos os contatos deste grupo estão desconectados ou existem erros"
+
+#~ msgid "Size: "
+#~ msgstr "Tamanho: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "Sessão bus não está disponível"
+
+#, fuzzy
+#~ msgid "Unable to load idle module"
+#~ msgstr "Impossível ingressar na sala"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Impossível ingressar na sala"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Uma senha é requerida para entrar nesta sala."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Você está banido desta sala."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Tal sala não existe."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "A criação de sala é restrita."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Seu nickname registado deve ser usado."
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Você não está na lista de membros."
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "Seu nickname desejado está em uso ou registado por um outro usuário.\n"
+#~ " Por favor, especifique um outro nickname abaixo:"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "nós estamos agora inscritos para %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "Remoção de Inscrição solicitada por %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "nós estamos agora sem inscrição para %s"
+
+#, fuzzy
+#~ 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 ""
+#~ "O Jid %s não é uma compilação da RFC. Não se adicionará a sua lista.  Use "
+#~ "ferramentas de gerência da lista como http://jru.jabberstudio.org/ para "
+#~ "removê-lo"
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr "A informação do registo para o transporte %s não chegou a tempo"
+
 #~ msgid "Sound"
 #~ msgstr "Som"
 
@@ -4992,9 +5104,6 @@ msgstr "ciano"
 #~ msgid "with account "
 #~ msgstr "conta: "
 
-#~ msgid "New Message as %s"
-#~ msgstr "Nova Mensagem como %s"
-
 #~ msgid "Chat with"
 #~ msgstr "Conversa com"
 
diff --git a/po/ru/LC_MESSAGES/gajim.po b/po/ru/LC_MESSAGES/gajim.po
index be0ea9364..1bfda616e 100644
--- a/po/ru/LC_MESSAGES/gajim.po
+++ b/po/ru/LC_MESSAGES/gajim.po
@@ -9,12 +9,12 @@
 #  <nebulam51@gmail.com>, 2005.
 # Yakov Bezrukov <nebulam51@gmail.com>, 2005.
 # Yakov Bezrukov <bezrukov@isp.nsc.ru>, 2005.
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2005-12-20 13:48+0000\n"
 "Last-Translator: Yakov Bezrukov <bezrukov@isp.nsc.ru>\n"
 "Language-Team:  <ru@li.org>\n"
@@ -60,7 +60,7 @@ msgid "Hidden"
 msgstr "Скрытый"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -78,62 +78,59 @@ msgstr ""
 "Выделение слов с опечатками выключено"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "Подключение недоступно"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Чат"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Чат"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "Шифрование OpenPGP"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "Ни %s не выдал OpenPGP ключ ни вы не присвоили ему такового"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Шифрование включено"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Шифрование отключено"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "не в ростере"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вы получили новое сообщение от \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -141,20 +138,20 @@ msgstr ""
 "Если вы закроете эту вкладку и у вас отключена функция ведения истории "
 "сообщений, то это сообщение будет потеряно."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Каждые %s _минут"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Событие"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -202,202 +199,215 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "Невозможно использовать OpenPGP"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Вы сейчас подсоединены к серверу"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "Для смены имени учетной записи необходимо отключиться."
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "Для смены имени учетной записи необходимо отключиться."
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Имя учетной записи не может быть пустым."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Имя учетной записи не может содержать пробелы."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID должен иметь формат \"имя_пользователя@сервер\"."
 
-#: ../src/config.py:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Неверная запись"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Такая учетная запись недоступна"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Перед редактированием личных данных необходимо сначала создать учетную "
 "запись."
 
-#: ../src/config.py:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Чтобы отредактировать личную информацию нужно подсоединиться к серверу."
 
-#: ../src/config.py:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Не удалось получить секретный ключ"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Есть проблемы с получением вашего OpenPGP секретного ключа."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Шифрование OpenPGP"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Выберите свой OpenPGP ключ"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Не выбран ключ"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "Править %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 #, fuzzy
 msgid "Member List"
 msgstr "_Участник"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 #, fuzzy
 msgid "Owner List"
 msgstr "_Владелец"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Администрирование"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 #, fuzzy
 msgid "Nick"
 msgstr "_Выгнать"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 #, fuzzy
 msgid "Role"
 msgstr "Обязанности:"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 #, fuzzy
 msgid "Banning..."
 msgstr "Забанить %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Что вы хотите сделать?</b>"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Что вы хотите сделать?</b>"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Что вы хотите сделать?</b>"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Администрирование"
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Что вы хотите сделать?</b>"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -407,77 +417,87 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление учетной записи %s"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "Учетная запись \"%s\" подключена к серверу"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Если вы удалите его, произойдет отключение."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Требуется Пароль"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Учетная запись \"%s\" подключена к серверу"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Если вы удалите его, произойдет отключение."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Новая Комната"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Пожалуйста, удостоверьтесь что заполнены поля с именем сервера и комнаты "
 "либо удалите эту закладку."
 
-#: ../src/config.py:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Неверный пароль"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 msgid "You must enter a password for the new account."
 msgstr "Необходимо ввести пароль для новой учетной записи."
 
-#: ../src/config.py:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля должны быть одинаковы."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Неверный Jabber ID"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Этот контакт уже содержится в вашем ростере."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "Учентая запись успешно добавлена"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -486,19 +506,19 @@ msgstr ""
 "Вы можете настроить ее используя \n"
 "\"Настройка->Учентые записи\" из главного окна."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Ваша новая учетная запись успешно создана"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "У меня уже есть учетная запись, которую я хочу использовать."
 
@@ -557,319 +577,325 @@ msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На компьютере не установлены биндинги питона для D-Bus"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Возможности работы Gajim с D-Bus не могут быть использованы"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Имя контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Транспорты"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Группа"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "В группе"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Имя контакта"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "Сообщение о Статусе %s"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Сообщение о Статусе"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Предустановленные Сообщения о Статусе</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Введите ваше новое сообщение о статусе"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Пожалуйста, заполните данные о вашей уже существующей учетной записи %s"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Пожалуйста, заполните данные для контакта который вы хотите добавить"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Транспорты"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "Неверный ID пользователя"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Контакт уже в ростере"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Этот контакт уже содержится в вашем ростере."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "Jabber-клиент на GTK+"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr "переводчики"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Запрос на подписку для учетной записи %s от %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запрос на подписку от %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 msgid "You can not join a group chat unless you are connected."
 msgstr "Вы не можете зайти в комнату без подключения."
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Войти в Комнату с учетной записи %s"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Войти в Комнату"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "Неверное имя пользователя"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Начать Беседу с учетной записью %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Начать Беседу"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 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:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Соединение невозможно"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Пожалуйста, удостоверьтесь что вы подключены к \"%s\"."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Для изменения пароль необходимо подсоединиться к серверу."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Вы должны ввести пароль."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Контакт В Сети"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Контакт Отключился"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Новое Сообшение"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Новое сообшение"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Новое Личное Сообщение"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Запрос Передачи"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Ошибка Передачи"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Передача Файла Завершена"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Передача остановлена"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 msgid "New E-mail"
 msgstr ""
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Запрос Передачи"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Ошибка Передачи"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Передача Файла Завершена"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Передача остановлена"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "Отсутствует"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Новое Сообщение с учетной записи %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Сообщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Отправить %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написал:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Консоль для %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "XML Консоль"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "Пригласил %(contact_jid)s в %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Выберите Звуковой Файл"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "В Формате Wav"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Другие"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Комнаты"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Для просмотра сервисов необходимо сначала подсоединиться к серверу"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Обзор Сервисов"
@@ -878,11 +904,11 @@ msgstr "Обзор Сервисов"
 msgid "Service Discovery"
 msgstr "Обзор Сервисов"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Сервис не обнаружен"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -890,175 +916,176 @@ msgstr ""
 "По этому адресу сервисы отсутствуют или не отвечают. Проверьте адрес и "
 "попробуйте еще раз."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Сервис недоступен для просмотра"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "используя учетную запись %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Браузер"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "Пере_регистрировать"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Присоединиться"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Сканирую %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Пользователи"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Описание"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Файл"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Время"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Прогресс"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Имя файла: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Вы"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Отправитель: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Получатель:"
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сохранено в: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Передача завершена"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Открыть Папку с Принятым Файлом"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Передача отменена"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "Соединение не может быть установлено."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Передача файла остановлена контактом на той стороне"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Выбрать Файл для Отправки..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Отправить"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "_Отправить"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Нет доступа к файлу"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Файл занят другим процессом."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Файл уже существует"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Что вы хотите сделать?</b>"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s хочет отправит вам файл:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Сохнанить Файл как..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Вы хотите переписать его?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1066,7 +1093,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
@@ -1083,12 +1110,12 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Нельзя отсылать пустые файлы"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Имя:  "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Отправитель:"
 
@@ -1096,32 +1123,32 @@ msgstr "Отправитель:"
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Продолжить"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "показывает помощь для данной команды"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "показать помощь по команде"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Скрывает или показывает окно ростера"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Показывать окно с следующим непрочитанным сообщением"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1129,44 +1156,44 @@ msgstr ""
 "Выводит список всех контактов в ростере. Каждый контакт будет в отдельной "
 "строке"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "Учетные записи"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "показывать контакты только для данной учетной записи"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Показывает список зарегистрированных учетных записей"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Изменить статус учетной записи или записей"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "статус"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "сообщение"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "сообщение сервера"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1175,19 +1202,19 @@ msgstr ""
 "изменить статус всех учетных записей у которых установлена опция "
 "\"синхронизировать с глобальным статусом\""
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Показывает окно беседы, чтобы вы могли отправлять сообщения контакту"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID контакта с которым вы хотели бы побеседовать"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "если указано, контакт будет взят из контакт-листа этой учетной записи"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1197,116 +1224,116 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'OpenPGP ключа', просто установите 'OpenPGP ключ' в ''."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "содержимое сообщения"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "PGP ключ"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "если указано, сообщение будет зашифровано с использованием открытого ключа"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 "если указано, сообщение будет отправлено с использованием этой учетной записи"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Получает детальную информацию о контакте"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID контакта"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Получает детальную информацию о контакте"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "У вас нет активной учетной записи"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Отправляет контакту файл"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Путь до файла"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr ""
 "если указано, файл будет отправлен с использованием этой учетной записи"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Показывает все параметры с их значениями"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Присваивает 'ключу' в 'значение'"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ключ' это название параметра, а 'значение' это то, что ему присваивают"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Удаляет параметр"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "имя параметра который нужно удалить"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Сохраняет текущее состояние настроек Gajim в файл .config"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Удаляет контакт из ростера"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Добавляет контакт в ростер"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Добавляет новый контакты для данной учетной записи"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущий статус (по-умолчанию глобальный, если не указана учетная "
 "запись)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
@@ -1314,16 +1341,16 @@ msgstr ""
 "Возвращает текущий статус (по-умолчанию глобальный, если не указана учетная "
 "запись)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущен аргумент \"JID контакта\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1332,16 +1359,16 @@ msgstr ""
 "'%s' не в вашем ростере\n"
 "Пожалуйста укажите учетную запись для отправки сообщения."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "У вас нет активной учетной записи"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Неизвестная версия D-Bus: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1350,16 +1377,16 @@ msgstr ""
 "Использование: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s не найден"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1368,7 +1395,7 @@ msgstr ""
 "Использование: %s команда [аргумента]\n"
 "Команда одна из:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1377,31 +1404,31 @@ msgstr ""
 "Аргумент \"%s\" не задан. \n"
 "На берите \"%s\" help \"%s\" для справки"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim для запуска требуется X-сервер. Выхожу..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim требуется PyGTK 2.6 или выше"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim для запуска требуется PyGTK 2.6 или выше. Выхожу..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim требуется GTK 2.6 или выше"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim для запуска требуется GTK 2.6 или выше. Выхожу..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "У GTK отсутствует поддержка libglade."
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1410,83 +1437,107 @@ msgstr ""
 "Пожалуйста, удалите вашу текущую версию GTK и установите последнюю "
 "стабильную версию с %s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Пожалуйста, удостоверьтесь что GTK и PyGTK поддерживают libglade."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim для запуска требуется PySQLite2"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Авторизация для %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Вы принимаете этот запрос?"
 
-#: ../src/gajim.py:498
-#, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "%(nickname)s из комнаты %(room_name)s отправил вам новое сообщение."
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Контакт В Сети"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s отправил вам новое сообщение"
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Контакт Отключился"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Новое Личное Сообщение"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Новое сообшение"
+
+#: ../src/gajim.py:610
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr ""
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "ошибка при отправке"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Авторизация принята"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 "Контакт \"%s\" авторизовал вас, теперь вы можете видеть его или её статус."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт \"%s\" отозвал подписку с вами"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Вы всегда будете видеть его или её в оффлайне."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Связь с \"%s\" не может быть установлена"
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Проверьте настройки сети или попробуйте еще раз позже."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Ваша парольная фраза неверна"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы сейчас соединены без OpenPGP ключа."
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
@@ -1494,51 +1545,46 @@ msgstr[0] "У вас есть непрочитанные сообщения"
 msgstr[1] "У вас есть непрочитанные сообщения"
 msgstr[2] "У вас есть непрочитанные сообщения"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хочет отправит вам файл."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получен файл %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передача файла %(filename)s от %(name)s приостановлена."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s успешно получил отправленный вами файл %(filename)s."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Передача файла %(filename)s к %(name)s приостановлена."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "vCard успешно опубликован"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Ваша информация о себе была успешно опубликована."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "Публикация vCard не удалась"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1547,162 +1593,146 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши установки и настройки"
 
-#: ../src/gajim.py:1719
-#, fuzzy
-msgid "GUI Migration failed"
-msgstr "Публикация vCard не удалась"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "История успешно перенесена в БД."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Отсутствует поддержка Управления Сессиями (отсутствует модуль gnome.ui)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Переношу Историю..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Пожалуйста, дождитесь окончания переноса истории..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Тема"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "имя тeмы"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Вы не можете удалить вашу текущую тему"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Пожалуйста, выберите сначала другую тему."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Начать Беседу"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Начать Беседу"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Не удалось отправить личное сообщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Вы больше не находитесь в комнате \"%s\" или \"%s\" вышел."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Комната"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Комната"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "У комнаты нет темы"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s выгнали из комнаты: %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s выгнал %(nick)s из комнаты: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s запретил %(nick)s заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s теперь известен как %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s ушел"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Ник не обнаружен: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Пригласил %(contact_jid)s в %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s не является нормальным JID"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Команды /%s не существует (если вы хотите её просто передать, то добавьте "
 "это с префикс /say)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Команды: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1715,19 +1745,19 @@ msgstr ""
 "данный момент находится в комнате, то он/она/оно так же будет выгнан. НЕ "
 "поддерживает пробелы в никах."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr ""
 "Использование: /%s <ник>, открывает окно привата с указанным посетителем."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Использование: /%s, очищает текстовое окно."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1736,12 +1766,12 @@ msgstr ""
 "Использование: /%s [причина], закрывает текущее окно или вкладку, с приводя "
 "причину, если она указана."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Использование: /%s, переводит окно комнаты в компактный режим."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1750,7 +1780,7 @@ msgstr ""
 "Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с "
 "возможным указанием причины."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1759,7 +1789,7 @@ msgstr ""
 "Использование: /%s <комната>@<сервер>[/ник], предлагает присоединиться к "
 "комната@сервер, с возможным указанием ника."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1769,7 +1799,7 @@ msgstr ""
 "Использование: /%s <ник> [причина], удаляет посетителя с указанным ником из "
 "комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1778,7 +1808,7 @@ msgstr ""
 "Использование: /%s <действие>, совершает действие в текущей комнате. "
 "Используйте третье лицо (напр. /%s взрывается.)"
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1787,18 +1817,18 @@ msgstr ""
 "Использование: /%s <ник> [сообщение], открывает окно привата и отсылает "
 "сообщение посетителю с указанным ником."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Использование: /%s <ник>, меняет ваш ник в текущей комнате."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -1806,70 +1836,70 @@ msgstr ""
 "Использование: /%s <сообщение>, отсылает сообщение без поиска других команд "
 "в нем."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Нет подсказки для /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Вы точно хотите покинуть комнату \"%s\"?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "Не _переспрашивать"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Изменяет Тему"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Пожалуйста, введите новую тему:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Изменяет Ник"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Пожалуйста, введите новый ник который вы хотите использовать:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Закладка уже установлена"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "Комната \"%s\" уже есть в ваших закладках."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Закладка успешно добавлена"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Вы можете управлять закладками через меню \"Действия\" в ростере."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Кикнуть %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
@@ -1917,111 +1947,120 @@ msgstr "<b>Расширенный Редактор Настроек</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Приложения</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Пользовательские настройки</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Описание</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Формат строки</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Настройки интерфейса</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Траффик</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Прочее</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Личная Информация</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Пожалуйста, выберите одну из опций из списка ниже:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Пожалуйста, заполните данные для вашей новой учетной записи</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Пожалуйста, выберите одну из опций из списка ниже:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Предустановленные Сообщения о Статусе</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Свойства</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Натройки</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Звуки</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Введите ваше новое сообщение о статусе"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Уведомления</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Что вы хотите сделать?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Ввод</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Список активных, завершенных и остановленных передач файлов"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "А_ккаунты"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "После ника:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "Подробнее"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Принять"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Учетные записи"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2033,52 +2072,44 @@ msgstr ""
 "Контакт\n"
 "Баннер"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Изменение Учетной записи"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Учетные записи"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "Расширенный _Действия"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Добавить Новый Контакт"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Уведомления</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Добавить _Контакт"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Адрес"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Расширенный"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Расширенный Редактор Настроек"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "После ника:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "После времени:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2088,55 +2119,55 @@ msgstr ""
 "Только печать\n"
 "Отключено "
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Отсылать информацию об _ОС"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Позволить ему или ей видеть мой статус"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "Позволять уведомления в режиме _ушел/недоступен/занят/невидимка"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "как iChat стиль"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Запрашивать сообщение о статусе в момент: "
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Попросить возможность видеть его или её статус"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Спрашивать:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Назначить OpenPGP ключ"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Авторизовать контакт (Он будет видеть ваш статус)"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Авто-_отошел после:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Авто-_недоступен после:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Автоматическое присоединение"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2148,15 +2179,15 @@ msgstr ""
 "Всегда использовать приложения KDE по умолчанию\n"
 "Другое"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Автоматически авторизовать контакт"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Автоподключение при разрыве связи"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2169,13 +2200,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "До ника:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "До времени:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "До ника:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2291,132 +2319,136 @@ msgid "Company:"
 msgstr "Компания:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Настроить _Комнату"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Подключиться когда я нажму Конец"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Соединение"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Информация о контакте"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "_Информация о Контакте"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "История"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "Страна:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "Иконки по _умолчанию для статуса"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Удалить MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Удалить фортунку"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Удаляет фортунку"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Отклонить"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr "Отклонить авторизацию от контакта (Он не сможет видеть ваш статус)"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Отделение:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Показавать аватары для контактов в ростере"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Показать сообщения о статусе контакта в ростере"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "Почта:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "Каждые 5 _минут"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Редактировать Группы"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Редактировать Личную Информацию..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Редактировать Группы"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Управление Смайликами"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Включить"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Введите опять для подтверждения:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Введите новый пароль"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "События"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "Каждые 5 _минут"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Дополнительный Адрес:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Фамилия:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Передачи"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "_Передачи"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Менеджер файлов:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Фильтр:"
@@ -2426,39 +2458,35 @@ msgid "Font style:"
 msgstr "Шрифт:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Шрифт:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Запретить ему или ей видеть мой статус"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Формат: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Частозадаваемые Вопросы (в сети)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "От:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "_Вперед"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Настройка Тем для Gajim"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2467,7 +2495,7 @@ msgid ""
 msgstr ""
 "Gajim может отсылать и получать метаданные относящиеся к беседе с контактом."
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2475,7 +2503,7 @@ msgstr ""
 "Gajim будет автоматически показывать новое полученное соощение в новом окне "
 "чата или табе в существующем окне чата"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2484,7 +2512,7 @@ msgstr ""
 "Gajim будет уведомлять вас о новом сообщении с помощью сообщения в правом "
 "нижнем углу экрана"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2492,7 +2520,7 @@ msgstr ""
 "Gajim будет уведомлять вас о присоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2500,26 +2528,34 @@ msgstr ""
 "Gajim будет уведомлять вас о отсоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajim будет лишь менять иконку у контакта, от которого пришло сообщение"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Мастер Создания Учетной Записи"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Общие"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Имя:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Нет"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Группа:"
@@ -2567,18 +2603,24 @@ msgid "I would like to add you to my contact list."
 msgstr "Вы не возражаете, если я добавлю Вас в контакт лист?"
 
 #: ../src/gtkgui.glade.h:170
-msgid "If checked, Gajim will also have a trayicon"
-msgstr "Если отмечено, то Gajim будет помещать иконку в трей"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
+msgstr ""
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 "Если отмечено, то Gajim будет показывать аватары контактов в окне ростера"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Если отмечено, то Gajim будет отображать сообщение о статусе контакта под "
 "его именем в окне ростера"
@@ -2659,8 +2701,9 @@ msgstr ""
 "выводить вместе контакты из всех учетных записей"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Входящее сообщение:"
+#, fuzzy
+msgid "Inactive"
+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:185
@@ -2696,39 +2739,57 @@ msgid "Location"
 msgstr "Расположение"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Сообщение"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Управление..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Управление Учетными записями"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Управление Закладками"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Управление Профилями Прокси"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Управление..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Отчество:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "_Модератор"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Еще"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Имя:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2736,109 +2797,105 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Ник:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Нет"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Уведомлять о контактах которые: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "В _каждой строке"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 #, fuzzy
 msgid "One message _window:"
 msgstr "Отправить сообщение и закрыть окно"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Открыть..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Исходящее сообщение:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "П_ароль"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Парольная фраза"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Приостановлено"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Редактировать Личную Информацию"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Телефон:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Проигрывать _звук"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Порт: "
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Должность:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Индекс:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Настройки"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Префикс:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "сообщение сервера"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Выводить время:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Приори_тет:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2849,59 +2906,51 @@ msgstr ""
 "той же учетной записью. Клиент с наибольшим приоритетом будет получать "
 "события"
 
-#: ../src/gtkgui.glade.h:237
-msgid "Profile, Avatar"
-msgstr "Профиль, Аватара"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Прокси:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Редактор Запросов..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Недавно:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Зарегистрировать в"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Удалит учетную запись _только из Gajim"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Удалить учетную запись из Gajim и с _сервера"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Удалить передачу из списка."
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr "Удаляет завершеные, отмененные и неудачные передачи из списка"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Ответить на это сообщение"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Вернуться к Цветам по Умолчанию"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "Ресу_рс: "
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2916,169 +2965,161 @@ msgstr ""
 "одновременно. Ресурс, который имеет больший приоритет будет получать все "
 "события. (См. ниже)"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Обязанности:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Настройки Комнаты"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Комната:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Сохранить _парольную фразу (небезопасно)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr "Сохранить _положение и размер ростера и окон бесед"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Сохнанить Файл как..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "_История всех контактов для этой учетной записи"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Сохранить _пароль"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Search"
 msgstr "_Поиск"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "_Отправить"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "_Отправить Файл"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Отправить _Сообщение"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Отправить _Файл"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Отправить _Новое Сообщение..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Отправить пинг"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Отправить сообщение и закрыть окно"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 msgid "Sends a message to currently connected users to this server"
 msgstr ""
 "Отправляет сообщение пользователям подсоединенным к серверу в данный момент"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Параметры Сервера"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Установить MOTD"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Установить фортунку"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Установить _Аватару"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Установить аватару при подсоединении"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Устанавливает фортунку"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Показать Непросмотренные _События"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Показать _Отключенных"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Показать _Ростер"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Показать _XML Консоль"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Показывать только в _ростере"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Shows a list of file transfers between you and other"
 msgstr "Показывает список передач между вами и остальными"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "В_ошли"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "В_ышли"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Сортировать контакты по статусу"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "Ста_тус"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Начать _Чат"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Штат:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Статус"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Сообщение сервера:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Статус:"
@@ -3109,25 +3150,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Син_хронизировать статус учетной записи с глобальным статусом"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Тема:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "Цвет _текста:"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "Цвет _шрифта:"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "Сообщение о статусе для авто-отошел"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "Сообщение о статусе для авто-недоступен"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Тема:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3153,50 +3195,56 @@ msgid "Type:"
 msgstr "Тип:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Подчеркивание"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "Обновить MOTD"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Обновить фортунку"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Обновляет фортунку"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Использовать _SSL (legacy)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "Использовать иконки для _транспортов"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Использовать аутентификацию"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Использовать пользовательские хост/порт"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "список передач"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Иконка в трее (или в области уведомления)"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "ID пользователя:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Показать уведомление по окончании загрузки"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3209,21 +3257,21 @@ msgstr ""
 "Событие соответствующее новому сообщению, не происходит если вы уже "
 "беседуете с контактом"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Когда получено новое сообытие"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Работа"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3231,414 +3279,453 @@ msgstr ""
 "Необходимо создать учетную запись для присоединения \n"
 "к Jabber сети."
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Ваш JID:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Действия"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "_Добавить Контакт..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "Добавить в Ростер"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Админ"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Администрирование"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "_Дополнительные действия"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "После времени:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Авторизовать"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "Цвет _фона"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Забанить"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "До времени:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "Добавить Эту Комнату в _Закладки"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Браузер:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "О_тменить"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "_Компактный Вид    Alt-C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Содержание"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "_Скопировать JID/Почтовый Адрес"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Копировать адрес ссылки"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Отклонить"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Просмотреть Сервисы"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Просмотреть Сервисы..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_ЧаВО"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Менеджер файлов:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Фильтр:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Закончить"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Шрифт:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "_Комната"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Помощь"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "Выделять _слова с опечатками"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_История"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Иконка в трее (или в области уведомления)"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Игнорировать события от контактов не из ростера"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Входящее сообщение:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "_Войти в Новую Комнату..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "_Выгнать"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "_История Сообщения"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "_История изменений статуса контактов"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "_Почтовый клиент:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Участник"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "_Объединить Учетные записи"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Сообщение"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Изменить"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "_Редактировать Учетную запись..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Имя: "
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Никогда"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "_Сообщать об этом"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомить меня когда передача файлов завершена"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "_Действия над Посетителем"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "_Пользователи В Сети"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Отправить Письмо"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Просмотреть Ссылку в Браузере"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Открыть..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Исходящее сообщение:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "_Владелец"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Приостановить"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Проигрыватель:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Вывести окно"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Настройки"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Присутствие"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Опубликовать"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Выйти"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "_Удалить из Ростера"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "П_ереименовать"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Ответить"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Вернуться к Цветам по Умолчанию"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Получить"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Пароль:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Поиск"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "_Отправить"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "Отправить и _Закрыть"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "_Отправить Личное Сообщение"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "_Отправить Сообщение Сервера"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "О_тправить Сообщение"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Сортировать контакты по статусу"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "Начать Чат"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Статус"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Сообщение сервера:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Подписаться"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Подписка"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+msgid "_URL:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Использовать прокси"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "_Имя пользователя:"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Право Говорить"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "_XML Консоль..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "список передач"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "минут"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Ошибка: не могу открыть %s для чтения"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Ошибка чтения файла:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Ошибка обработки файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Не могу писать в %s. Управление Сессиями будет недоступно"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Поиск"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Удалить MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Поиск"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "создается БД истории"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3647,38 +3734,38 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Переношу Историю..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Дата"
@@ -3712,75 +3799,81 @@ msgstr "Статус установлен в:  %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Статус установлен в: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Сообщение"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Начать Беседу с учетной записью %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Объединенные учетные записи"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 #, fuzzy
 msgid "Observers"
 msgstr "Сервер"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Вы уже в комнате %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Вы не можете зайти в комнату так как вы в режиме невидимости."
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "_Войти в Новую Комнату"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Управление Закладками..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "учетной записи %s"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "используя %s учетную запись"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "используя учетную запись %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Управление Закладками..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_История"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "_Войти в Новую Комнату"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" будет удален"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3788,67 +3881,76 @@ msgstr ""
 "У вас теперь не будет возможности приема и отправки сообщения контактам "
 "через этот транспорт."
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Назначить OpenPGP Ключ"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ который будет применен к контакту"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr "Вы не против если я добавлю Вас себе в ростер?"
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "П_ереименовать"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "_Соединиться"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "_Отключиться"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "_Изменить Сообщение о Статусе"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь \"%s\" будет знать о вашем статусе."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если \"%s\" примет ваш запрос, вы будете знать его или её статус"
 
-#: ../src/roster_window.py:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "Авторизация была удалена"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь \"%s\" всегда будет видеть вас в оффлайне."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" будет удален из вашего ростера"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
+"его или её всегда в оффлайне."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3856,37 +3958,37 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
 "его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу чтобы этот контакт видел мой статус после удаления"
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Требуется Парольная Фраза"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Введите парольную фразу GPG ключа для %s"
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Сохранить парольную фразу (небезопасно)"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Парольная фраза"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3894,20 +3996,20 @@ msgstr ""
 "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
 "хотите стать в невидимым?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Неи доступной учетной записи"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: ../src/roster_window.py:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3915,34 +4017,30 @@ msgstr ""
 "Сообщения будут доступны для чтения позже если у вас активирована опция "
 "истории."
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "От %s в комнате %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Отправляет контакту файл"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Изменить Сообщение о Статусе..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Изменить Сообщение о Статусе..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Скрыть это меню"
 
-#: ../src/systray.py:264
-msgid "All contacts in this group are offline or have errors"
-msgstr "Все контакты в это группе отключены или имеют ошибки"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
@@ -3950,7 +4048,7 @@ msgstr[0] "Gajim - %d непрочитанное сообщение"
 msgstr[1] "Gajim - %d непрочитанных сообщения"
 msgstr[2] "Gajim - %d непрочитанных сообщений"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
@@ -3958,7 +4056,7 @@ msgstr[0] "Gajim - %d непрочитанное одиночное сообще
 msgstr[1] "Gajim - %d непрочитанных одиночных сообщения"
 msgstr[2] "Gajim - %d непрочитанных одиночных сообщений"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
@@ -3966,7 +4064,7 @@ msgstr[0] "Gajim - %d непрочитанное сообщение в комн
 msgstr[1] "Gajim - %d непрочитанных сообщения в комнате"
 msgstr[2] "Gajim - %d непрочитанных сообщений в комнате"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
@@ -3974,96 +4072,88 @@ msgstr[0] "Gajim - %d непрочитанное личное сообщение
 msgstr[1] "Gajim - %d непрочитанных личных сообщения"
 msgstr[2] "Gajim - %d непрочитанных личных сообщения"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Должность: "
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Ранг: "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Статус: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Статус: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Подписка: "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "Иконки по _умолчанию для статуса"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Размер: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Тип: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Загрузить"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Размер: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Тип: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Передано: "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Не начато"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Остановлено"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Завершено"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Приостановлено"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Ожидание"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Передается"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Этот сервис еще не сообщил информацию о себе"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4071,33 +4161,33 @@ msgstr ""
 "Этот сервис не может предоставить информацию о себе . \n"
 "Похоже что он или неверно настроен или сломан"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Выбрать Аватару"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Картинки"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Просматриваю %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4105,7 +4195,7 @@ msgstr ""
 "Этот контакт хочет знать о вашем присутствии, но вам информация о его или её "
 "присутствии не интересна"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4113,35 +4203,35 @@ msgstr ""
 "Вам хочется получать информацию о присутствии контакта, но он или она не "
 "заинтересована в вашей."
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Вы и контакт оба желаете знать о присутствии друг друга"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Ни вы ни ваш контакт не желаете знать о присутствии друг друга"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы ожидаете ответа контакта на запрос на подписку"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr "Необходимо присоединиться к серверу для обновления личной информации"
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 "Необходимо присоединиться к серверу для получения информации о контакте"
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 #, fuzzy
 msgid "Personal details"
 msgstr "Редактировать Личную Информацию"
@@ -4186,45 +4276,47 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "На машине отсутствует D-Bus или модуль питона для нее"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "D-Bus сервер недоступен"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Использовать DBus и Сервис Уведомлений для показа уведомлений"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Время в минутах, после которого ваш статус изменится на Отошел."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Статус 'Отошел' ввиду отсутствия пользователя."
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Время в минутах, после которого ваш статус изменится на Недоступен."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Статус 'Недоступен' ввиду отсутствия пользователя."
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Если True, то не будут удаляться */_. Так что *фыва* будут написаны "
 "полужирным шрифтом, но * * удалены не будут"
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Добавлять * и [n] в окно ростера?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4232,11 +4324,11 @@ msgstr ""
 "Сколько строк из предыдущей беседы выводить, когда вкладка/окно открываются "
 "вновь."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Сколько минут должны оставаться последние строки из предыдущей беседы."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4244,20 +4336,20 @@ msgstr ""
 "Оправлять сообщения по Ctrl+Enter и Enter создает новую строку (как в "
 "Mirabilis ICQ)"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Сколько строк хранить для Ctrl+Стрелка вверх"
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Использовать компактный вид для окна беседы"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Использовать компактный вид для окна комнаты"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4266,31 +4358,31 @@ msgstr ""
 "Введите свою ссылку с %s, в которой %s подменяет слово/фразу или "
 "'WIKTIONARY', что значит: \"использовать wiktionary\"."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Если отмечено, то Gajim'ом можно будет управлять удаленно с использованием "
 "gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Спрашивать перед закрытием окна/вкладки комнаты."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Спрашивать перед закрытием окна/вкладки комнаты."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Спрашивать перед закрытием окна/вкладки комнаты."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4298,30 +4390,30 @@ msgstr ""
 "Указвает имя хоста, которое мы отсылаем при Передаче Файлов, в случае если "
 "мы за NAT или используется проброс портов."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC утверждает что KiB = 1024 байт, KB = 1000 байт"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Показывать вкладку при одной беседе?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Показывать границу вкладки при одной беседе?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Показывать кнопку закрытия на вкладке?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr ""
 "Список слов с ; в качестве разделителя, которые будут выделяться в комнате."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4329,11 +4421,11 @@ msgstr ""
 "Если True, то Gajim будет завершаться при нажатии на кнопку закрытия окна. "
 "Эта опция учитывается только если используется иконка для трея."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Если True, то Gajim будет регистрировать xmpp:// при каждом запуске"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4341,7 +4433,7 @@ msgstr ""
 "Если True, то Gajim иконку на каждой вкладке, которая содержит непрочитанные "
 "сообщения. В зависимости от темы, она может быть анимированной."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4349,7 +4441,7 @@ msgstr ""
 "Если True, то Gajim будет отображать сообщение о статусе, если оно не "
 "пустое, для каждого контакта под именем контакта в окне ростера"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4358,7 +4450,7 @@ msgstr ""
 "которого её не было в последний раз или она уже слишком старая."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4366,20 +4458,20 @@ msgstr ""
 "Если False, то вы больше не будете видеть статусную строку в окне беседы, "
 "когда контакт меняет его или её статус и/или сообщение о статусе."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4390,14 +4482,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Сплю"
@@ -4468,182 +4571,97 @@ msgstr ""
 "опция учитывается только тогда, когда notify_on_all_muc_messages установлено "
 "в True)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "зеленый"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "овошной"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "телесный"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "морской"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "чистый"
-
-#: ../src/common/connection.py:68
-#, fuzzy
-msgid "Unable to load idle module"
-msgstr "Не могу войти в комнату"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Не могу войти в комнату"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "Для входа в комнату необходим пароль."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Вам запрещено заходить в эту комнату."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Такой комнаты не существует."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "Запрещено созднание комнат."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Вы должны использовать свой зарегистрированный ник."
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Вы не находитесь в списке участников."
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Ник, который вы указали уже используется другим посетителем.\n"
-"Пожалуйств, укажите другой ник ниже:"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-msgid "I would like to add you to my roster."
-msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "%s отменил подписку с вами"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "запрос на отписку от %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "%s отменил подписку с вами"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Связь с учетной записью \"%s\" была потеряна"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Требуется переподключение для продолжения приема и отправки сообщений."
 
-#: ../src/common/connection.py:1464
-#, fuzzy, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s не соответствует RFC. Он не будет добавлен в ваш ростер. Используете "
-"утилиты для управления ростером такими как http://jru.jabberstudio.org/ для "
-"того, чтобы его удалить"
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Неверный пароль"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Неверный пароль"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не могу соединиться с \"%s\""
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Подключен к серверу %s: %s с %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Проверьте настройки сети или попробуйте еще раз позже"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Ошибка аутентификации с \"%s\""
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 msgid "Please check your login and password for correctness."
 msgstr "Пожалуйста, проверьте правильность логина и пароля."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "Не задана парольная фраза OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Вы будете подключены к %s без использования OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "невидимка"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "отключен"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Я %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Это сообщения зашифровано]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4652,207 +4670,206 @@ msgstr ""
 "Тема: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Регистрационная информация для транспорта %s не пришла вовремя"
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
+msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Неверный символ в имени пользователя."
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Требуется адрес сервера."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Неверный символ в имени сервера"
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Неверный символ в ресурсе"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Занят"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Занят"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_Недоступен"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Недоступен"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "_Готов Поболтать"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Готов Поболтать"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "_Доступен"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Доступен"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Соединяюсь"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "_Ушел"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Ушел"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "_Отключен"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Отключен"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "_Невидимка"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Невидимка"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "Ошибка"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "Нет"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "К"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "От"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Оба"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "Нет"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "Отсутствует"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Модераторы"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Участники"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Посетители"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Посетитель"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "читает сообщение"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "занят чем-то еще"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "печатает сообщение..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "прервал печать сообщения"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "закрыл окно чата или вкладку"
 
@@ -4862,10 +4879,105 @@ msgstr "закрыл окно чата или вкладку"
 msgid "error: cannot open %s for reading"
 msgstr "ошибка: не могу открыть %s для чтения"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "чистый"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "синий"
 
+#~ msgid "Send"
+#~ msgstr "Отправить"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr "%(nickname)s из комнаты %(room_name)s отправил вам новое сообщение."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s отправил вам новое сообщение"
+
+#, fuzzy
+#~ msgid "GUI Migration failed"
+#~ msgstr "Публикация vCard не удалась"
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "История успешно перенесена в БД."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr "Если отмечено, то Gajim будет помещать иконку в трей"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Профиль, Аватара"
+
+#~ msgid "_Online Users"
+#~ msgstr "_Пользователи В Сети"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Начать Беседу с учетной записью %s"
+
+#~ msgid "All contacts in this group are offline or have errors"
+#~ msgstr "Все контакты в это группе отключены или имеют ошибки"
+
+#~ msgid "Size: "
+#~ msgstr "Размер: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "D-Bus сервер недоступен"
+
+#, fuzzy
+#~ msgid "Unable to load idle module"
+#~ msgstr "Не могу войти в комнату"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Не могу войти в комнату"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Для входа в комнату необходим пароль."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Вам запрещено заходить в эту комнату."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Такой комнаты не существует."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "Запрещено созднание комнат."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Вы должны использовать свой зарегистрированный ник."
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Вы не находитесь в списке участников."
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "Ник, который вы указали уже используется другим посетителем.\n"
+#~ "Пожалуйств, укажите другой ник ниже:"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "%s отменил подписку с вами"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "запрос на отписку от %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "%s отменил подписку с вами"
+
+#, fuzzy
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s не соответствует RFC. Он не будет добавлен в ваш ростер. "
+#~ "Используете утилиты для управления ростером такими как http://jru."
+#~ "jabberstudio.org/ для того, чтобы его удалить"
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr "Регистрационная информация для транспорта %s не пришла вовремя"
+
 #~ msgid "Sound"
 #~ msgstr "Звук"
 
diff --git a/po/sk/LC_MESSAGES/gajim.po b/po/sk/LC_MESSAGES/gajim.po
index 6d2d24d15..2c968ae1b 100644
--- a/po/sk/LC_MESSAGES/gajim.po
+++ b/po/sk/LC_MESSAGES/gajim.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the gajim package.
 # Juraj Michalek <juraj.michalek@asinus.org>, 2005.
 #
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2006-02-26 09:18+0100\n"
 "Last-Translator: Juraj Michalek <juraj.michalek@asinus.org>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -55,7 +55,7 @@ msgid "Hidden"
 msgstr "Skrytý"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -73,82 +73,79 @@ msgstr ""
 "Zvýrazňovanie zle napísaných slov nebude používané"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 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/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Rozhovor"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Rozhovor"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP šifra"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s nezverejnil svoj OpenPGP kľúč, alebo nemá žiadny vytvorený"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Šifrovanie zapnuté"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Šifrovanie vypnuté"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "nie je v zozname"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Práve ste prijali(a) novú správu od \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "Ak zatvoríte túto záložku a máte deaktivovanú históriu, správa bude stratená."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Každých %s _minút"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Aktívne"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -196,153 +193,166 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP nie je použiteľné na tomto počítači"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Práve ste pripojený na server"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "Pre zmenu mena účtu sa musíte byť odpojený."
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "Pre zmenu mena účtu sa musíte byť odpojený."
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Nesprávne meno účtu"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Meno účtu nemôže byť prázdne."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Meno účtu nemôže obsahovať medzery."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Nespravné Jabber ID"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabbe ID musí byť v tvare \"používateľ@menoserveru\""
 
-#: ../src/config.py:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Nesprávny záznam"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "Port musí byť číslo."
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Žiadný účet nie je k dispozícii"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Musíte si vytvoriť účet, predtým než budete môcť meniť osobné informácie."
 
-#: ../src/config.py:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený na server"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez pripojenia nemôžete meniť osobné informácie."
 
-#: ../src/config.py:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Nepodarilo sa vygenerovať tajné kľúče"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 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:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP šifra"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Žiadny kľúč nie je vybraný"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Meno"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovať na %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr "Čierna listina"
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 msgid "Member List"
 msgstr "Zoznam členov"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 msgid "Owner List"
 msgstr "Zoznam vlastníkov"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 msgid "Administrator List"
 msgstr "Zoznam správcov"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr "Dôvod"
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 msgid "Nick"
 msgstr "Prezývka"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 msgid "Role"
 msgstr "Rola"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 msgid "Banning..."
 msgstr "Zakazovanie..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -350,11 +360,11 @@ msgstr ""
 "<b>Koho chcete zakázať?</b>\n"
 "\n"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr "Pridávanie člena..."
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -362,11 +372,11 @@ msgstr ""
 "<b>Koho chcete pridať k členom?</b>\n"
 "\n"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr "Pridávanie vlastníka..."
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -374,11 +384,11 @@ msgstr ""
 "<b>Koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 msgid "Adding Administrator..."
 msgstr "Pridávanie Administrátora..."
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -386,7 +396,7 @@ msgstr ""
 "<b>koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -402,77 +412,87 @@ msgstr ""
 "4. doména (doména sama o sebe, ľubovoľný používateľ@doména,\n"
 "doména/zdroj, alebo adresa obsahujúca subdoménu."
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstrániť %s účet"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "Účet \"%s\" je pripojený na server"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Účet \"%s\" je pripojený na server"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Nová miestnosť"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Táto záložka obsahuje chybné údaje"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 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:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Nesprávne meno používateľa"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 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:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Nesprávne heslo"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 msgid "You must enter a password for the new account."
 msgstr "Musíte vložiť heslo pre nový účet."
 
-#: ../src/config.py:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "Heslá vložené do oboch polí musia byť rovnaké."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Nespravné Jabber ID"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Kontakt je už zanesený v zozname."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -481,19 +501,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:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Váš nový účet bol vytvorený úspešne"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Nastala chyba pri vytváraní účtu"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Meno účtu je už používané"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto menom."
 
@@ -552,163 +572,162 @@ msgid "Subject: %s\n"
 msgstr "Predmet: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python väzba chýba na tomto počítači"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus vlastnosti Gajimu nemôžu byť použité"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Meno kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Transport"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "V skupine"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "ID kľúča"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Kontaktné meno"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Správa o stave"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Správa o stave"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Vrátiť pôvodnú správu o stave</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Zadajte vašu novú správu o stave:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Prosím vyplnte údaje o kontakte, ktorý chcete pridať do účtu %s"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplnte údaje o kontakte, ktorý chcete pridať"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Transport"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "Nespravné používateľské ID"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Táto služba neobsahuje žiadne položky."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Kontakt je už v zozname"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Kontakt je už zanesený v zozname."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klient"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr "POĎAKOVANIE:"
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 #, fuzzy
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "V neposlednej rade ďakujeme všetkým správcom balíkov (package maintainers)"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr "Juraj Michálek <juraj.michalek@asinus.org>"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Požiadavka na prihlásenie účtu %s od %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Požiadavka na prihlásenie od %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 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:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pripojiť do diskusnej skupiny s účtom %s"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Pripojiť do diskusnej skupiny"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 msgid "Invalid room or server name"
 msgstr "Nesprávne meno miestnosti alebo serveru"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr "Meno miestnosti alebo meno servera obsahuje nepovolené znaky"
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začať rozhovor s účtom %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Začať rozhovor"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -717,157 +736,164 @@ msgstr ""
 "odoslať správu:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím, uistite sa, že ste pripojený(á) k \"%s\"."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "Bez pripojenia nemôžete meniť heslo."
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Musíte vložiť heslo."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Kontakt sa pripojil"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Kontakt sa odpojil"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Nová správa"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Nová jednoduchá správa"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Nová privátna správa"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Požiadavka na prenos súboru"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Chyba pri prenose súboru"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Prenos súboru dokončený"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Prenos súboru zastavený"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Požiadavka na prenos súboru"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Chyba pri prenose súboru"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Prenos súboru dokončený"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Prenos súboru zastavený"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "?Skupinová diskusia - rola: Nič"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Jednoduchá správa s účtom %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Jednoduchá správa"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Poslať %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napísal:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konzola pre %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "XML konzola"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "Pozvaný(á) %(contact_jid)s do %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentár: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Vybrať zvuk"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Všetky súbory"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Wav zvuk"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Ostatný"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Konferencia"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez pripojenia, nemôžete prehľadávať dostupné služby"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prehľadávanie služieb"
@@ -876,11 +902,11 @@ msgstr "Prehľadávanie služieb"
 msgid "Service Discovery"
 msgstr "Prehľadávanie služieb"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Služba nebola nájdená"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -888,174 +914,175 @@ msgstr ""
 "Nie je k dispozícii žiadna služba na zadanej adrese alebo neodpovedá. "
 "Skontrolujte adresu a skúste neskôr."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Služba nie je prechádzateľná"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Tento typ služby neobsahuje žiadne položky na prechádzanie."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "použiť %s účet"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Prechádzať"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Táto služba neobsahuje žiadne položky."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "Re_gistrácia"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Pripojiť"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Prieskum %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Používatelia"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Popis"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Súbor"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Stav"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Meno súboru: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Veľkosť: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Vy"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Odosielateľ: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Príjemca:"
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Uložené do: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Otvoriť adresár"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Prenos súboru bol zrušený"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "Spojenie s druhou stranou nie je možné nadviazať."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Prenos súboru bol zastavený druhou stranou"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Vyberte súbor na odoslanie..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Poslať"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "_Poslať"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemôže pracovať s týmto súborom"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Tento súbor je používaný iným procesom."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Tento súbor už existuje"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 msgid "What do you want to do?"
 msgstr "Čo si prajete vykonať?"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Súbor: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vám chce poslať súbor:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Uložiť ako..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Prajete si prepísať ho?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1063,7 +1090,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
@@ -1080,12 +1107,12 @@ msgstr "Súbor:"
 msgid "It is not possible to send empty files"
 msgstr "Nie je možné poslať prázdne súbory"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Meno:"
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Odosielateľ:"
 
@@ -1093,32 +1120,32 @@ msgstr "Odosielateľ:"
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Pokračovať"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "ukáž dokumentáciu pre špecifikovaný príkaz"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "príkaz"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "ukáž pomoc pre príkaz"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Ukázať alebo skryť okno so zoznamom"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Zobraz popup okno s ďalšou neprečítanou správou"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1126,44 +1153,44 @@ msgstr ""
 "Vytlačiť zoznam všetkých kontaktov v zozname. Každý kontakt bude na "
 "samostatnom riadku"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "účet"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "zobraziť len kontakty daného účtu"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Vytlačiť zoznam registrovaných účtov"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Zmeniť stav účtu alebo účtov"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "stav"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: offline, online, chat, preč, diskutovať, zaneprázdnený, neviditeľný"
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "správa"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "správa o stave"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1171,19 +1198,19 @@ msgstr ""
 "zmeniť stav účtu \"účet\". Ak nie je špecifikovaný, pokús sa zmeniť všetky "
 "účty, ktoré majú nastavenú vlastnosť \"synchronizácia s globálnym stavom\""
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Zobrazí diskusné okno, takže môžete odoslať správu kontaktu"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, s ktorým chcete komunikovať"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ak je špecifikované, kontakt je zobraný zo zoznamu pre tento účet"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1193,128 +1220,128 @@ msgstr ""
 "nepovinné. Ak chcete nastaviť iba 'účet', bez 'OpenPGP kľúča', nastavte "
 "'OpenPGP kľúč' na ''"
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, ktorý prijme správu"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "obsah správy"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "pgp kľúč"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ak je špecifikovaný, správa bude zašifrovaná s použitím verejného kľúča"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "ak je špecifikovaný, správa bude odoslaná s použitím tohoto účtu"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Získať detailné informácie o kontakte"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Získať detailné informácie o kontakte"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Nemáte žiadny aktívny účet"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Poslať súbor kontaktu"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "súbor"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Cesta k súboru"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "ak je špecifikovaný, súbor bude odoslaný pod týmto účtom"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Výpis všetkých nastavení a hodnôt"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastaviť hodnotu 'kľúča' na 'hodnotu'."
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "kľúč=hodnota"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'kľúč' je meno vlastnosti, 'hodnota' je hodnota, na ktorú má byť nastavený"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Zmazať položku z nastavenia"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "kľúč"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "meno nastavenia bolo zmazané"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíš aktuálny stav Gajimu do súboru s nastavením .config"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Odstrániť kontakt zo zoznamu"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Pridať kontakt do zoznamu"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Pridať nový kontakt pre tento účet"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vrátiť aktuálny stav (použije sa globálny, pokiaľ nie je vybraný účet)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Vrátiť aktuálnu správu o stave (použije sa globálny, pokiaľ nie je vybraný "
 "účet)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Máte neprečítané správy"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Chýbajúci argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1323,16 +1350,16 @@ msgstr ""
 "'%s' nie je vo vašom zozname.\n"
 "Prosím, špecifikujte účet, ktorému správu posielate."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Nemáte žiadny aktívny účet"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Neznáma D-Bus verzia: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1341,16 +1368,16 @@ msgstr ""
 "Použitie: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s nenájdený"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1359,7 +1386,7 @@ msgstr ""
 "Použitie: %s príkaz [argumenty]\n"
 "Príkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1368,31 +1395,31 @@ msgstr ""
 "Argument \"%s\" nie je špecifikovaný. \n"
 "Zadajte \"%s help %s\" pre viac informácií"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim potrebuje Xserver pre svoj beh. Ukončenie..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim potrebuje PyGTK 2.6+ alebo novšiu"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim potrebuje PyGTK 2.6+ alebo novšiu pre svoj beh. Ukončenie..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim potrebuje GTK 2.6+ alebo novšia"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim potrebuje GTK 2.6+ alebo novšiu pre svoj beh. Ukončenie..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtimu chýba podpora libglade"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1401,83 +1428,107 @@ msgstr ""
 "Prosím, odstráňte vašu aktuálnu verziu GTK+ prostredia a nainštalujte si "
 "poslednú stabilnú verziu z %s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Prosím, uistite sa, že GTK+ a PyGTK majú podporu pre libglade vo vašom "
 "systéme."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim potrebuje PySQLite2  pre svoj beh"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorizácia pre %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Akceptujete túto požiadavku?"
 
-#: ../src/gajim.py:498
-#, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "%(nickname)s v miestnosti %(room_name)s vám poslal(a) správu."
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Kontakt sa pripojil"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s vám poslal(a) správu."
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Kontakt sa odpojil"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Nová privátna správa"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nová jednoduchá správa"
+
+#: ../src/gajim.py:610
+#, fuzzy, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nová správa ako %s"
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "chyba pri odosielaní"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Autorizácia akceptovaná"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" bol autorizovaný, takže uvidíte jeho alebo jej stav."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" vás odobral zo svojho zoznamu"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Vždy uvidíte jeho alebo ju ako offline."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Spojenie s \"%s\" nie je možné nadviazať"
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Skontrolujte svoje pripojenie alebo skúste neskôr."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s je teraz %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Vaša passfráza je nesprávna"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálne ste pripojení(á) bez vášho OpenPGP kľúča."
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, fuzzy, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr "%(new_mail_gajim_ui_msg)s na %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1045
 #, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
@@ -1485,51 +1536,46 @@ msgstr[0] "Máte %d novú E-mailovú správu"
 msgstr[1] "Máte %d nových E-mailových správ"
 msgstr[2] "Máte %d nových E-mailových správ"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr "%(new_mail_gajim_ui_msg)s na %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s chce vám poslať súbor."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Úspešne ste prijali(a) súbor %(filename)s od %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Úspešne odoslaný súbor %(filename)s pre %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "zverejnenie vCard úspešné"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Vaše osobné informácie boli úspešne zverejnené."
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "zverejnenia vCard zlyhalo"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1538,163 +1584,145 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia."
 
-#: ../src/gajim.py:1719
-msgid "GUI Migration failed"
-msgstr "Migrácia prostredníctvo grafického rozhrania zlyhala"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-"Migrácia záznamov konverzácie prostredníctvom grafického nástroja neuspela. "
-"Proces migrácie bude spustený na pozadí. Prosím počkajte pár minút, kým sa "
-"Gajim spustí."
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "Záznamy boli úspešne prenesené do databázy."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Podpora Správy sedenia nie je dostupná (chýba gnome.ui modul)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Presun záznamov histórie..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Prosím počkajte, pokým prebieha migrácia záznamov z komunikácie..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Téma"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "meno témy"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Nemôžete zmazať aktuálnu tému"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Prosím, vyberte najskôr inú tému."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Súkromný rozhovor"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Súkromný rozhovor"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Odoslanie súkromnej správy sa nepodarilo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, 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/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Skupinový rozhovor"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Skupinový rozhovor"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Táto miestnosť nemá nastavenú tému"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s bol vykopnutý: %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s bol vykopnutý - %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s bol zakázaný: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s bol zakázaný - %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Teraz ste známy(a) ako %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s je známy(a) ako %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s odišiel"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s je teraz %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Prezývka nenájdená: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozvaný(á) %(contact_jid)s do %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nevyzerá ako správny JID"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Neznámy príkaz: /%s (ak chcete toto odoslať, zaraďte znak / pred to, čo "
 "hovoríte)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Príkazy: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1706,19 +1734,19 @@ msgstr ""
 "človeka môže byť zmenená, ale nesmie obsahovať \"@\". Ak je JID práve v "
 "miestnosti, on/ona/ono bude vykoponutý(á). Nepodporuje medzery v prezývkach."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr ""
 "Použitie: /%s <prezývka>, otvorí okno na súkromnú komunikáciu s človekom."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Použiteie: /%s, vyčistí textové okno."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1727,13 +1755,13 @@ msgstr ""
 "Použitie: /%s [dôvod], zatvorí aktuálnu záložku v okne a zobrazí "
 "zdôvodnenie, pokiaľ je špecifikované."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr ""
 "Použitie: /%s, nastaví okno pre skupinový rozhovor do kompaktného módu."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1742,7 +1770,7 @@ msgstr ""
 "Použitie: /%s <JID> [dôvod], pozve JID do aktuálnej miestosti, prípadne sa "
 "zobrazí aj oddôvodnenie."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1751,7 +1779,7 @@ msgstr ""
 "Použitie: /%s <miestnosť>@<server>[/prezývka], ponúkne možnosť pripojiť sa "
 "do miestnosť@server pre nick, ak je špecifikovaný."
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1761,7 +1789,7 @@ msgstr ""
 "Použitie: /%s <prezývka> [dôvod], odstráni navštevníka z miestnosti podľa "
 "prezývky, prípadne zobrazí dôvod. Nepodporuje medzery v menách."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1770,7 +1798,7 @@ msgstr ""
 "Použitie: /%s <akcia>, odošle akciu pre aktuálnu miestnosť. Používajte "
 "tretiu osobu. (napr. /%s exlodoval(a).)"
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1779,86 +1807,86 @@ msgstr ""
 "Použitie: /%s <prezývka> [správa], otvorí okno na súkromnú komunikáciu s a "
 "prípadne odošle správu."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Použitie: /%s <prezývka>, zmení prezývku v aktuálnej miestnosti."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Použitie: /%s [téma], zobrazí alebo zaktualizuje tému v miestnosti."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Použitie: /%s <správa>, odošle správu, bezohľadu na ďalšie príkazy."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Žiadne informácie s pomocou pre /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Ste si istý(á), že chcete opustiť miestnosť \"%s\"?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "Ak zatvoríte okno, budete odpojený(á) z tejto miestnosti."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "Znovu sa už _nepýtať pri zatváraní \"%s\""
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Zmena predmetu"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Prosím, špecifikujte nový predmet:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Zmena prezývky"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím špecifikujte novú prezývku, ktorú chcete používať:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavená"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "Miestnosť \"%s\" je už vo vašich záložkách."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Záložka bola úspešne pridaná"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Môžete spravovať záložky cez Akcie v menu vo vašom zozname."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Vykopnúť %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Môžete špecifikovať dôvod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Zakázať %s"
@@ -1906,111 +1934,120 @@ msgstr "<b>Editor rozšírenej konfigurácie</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Aplikácie</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Vlastné</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Popis</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Formát riadku rozhovoru</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Úprava rozhrania</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Prevádzka Jabber-a</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Rôzne</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Osobné informácie</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Prosím, vyberte jednu z možností:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Prosím, vyplnte údaje o vašom účte</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Prosím, vyberte jednu z možností:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Vrátiť pôvodnú správu o stave</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Vlastnosti</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Nastavenia</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Zvuky</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Zadajte vašu novú správu o stave:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Vizuálne upozornenie</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Čo si prajete vykonať?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>XML vstup</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Zoznam aktívnych, dokončených a zastavených prenosov súborov"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "Úč_ty"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Po prezývke:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "Informácie"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Prijať"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Účet"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2022,52 +2059,44 @@ msgstr ""
 "Kontakt\n"
 "Transparent"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Modifikácia účtu"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Účty"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "_Rozšírené akcie"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Pridať nový kontakt"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Vizuálne upozornenie</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Pridať _kontakt"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Adresa"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Rozšírený editor na editovanie konfigurácie"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Po prezývke:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Po čase:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2077,56 +2106,56 @@ msgstr ""
 "Len pri písaní\n"
 "Vypnuté"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Povoliť _odosielanie informácie o operačnom systéme"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Povoliť jemu/jej vidieť môj stav"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Povoliť popup/upozornenia v stavoch _preč/nedostupný/zamestnaný/neviditeľný"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "Tiež známy ako iChat štýl"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Vyžiadať správu o stave, keď som:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Požiadať jeho/ju o súhlas pre zobrazenie stavu"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Požiadať:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Prideliť Open_PGP kľúč"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorizovať kontakt, od teraz vude vidieť kedy ste pripojený(á)"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Automaticky _preč po:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Automaticky _neprítomný(á) po:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Automaticky pripojiť"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2138,15 +2167,15 @@ msgstr ""
 "Vždy použiť aplikácie prostredia KDE ako predvolené\n"
 "Vlastné"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Automaticky autorizovať kontakt"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Automatické pripojenie po strate spojenia"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2159,13 +2188,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Pred prezývkou:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Pred časom:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Pred prezývkou:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2278,134 +2304,138 @@ msgid "Company:"
 msgstr "Spoločnosť:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Nastaviť _miestnosť"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Pripojiť, keď stlačím Dokončiť"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Spojenie"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Kontaktné informácie"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "Kontaktné _info"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "História konverzácie"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "Krajina:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "Základná _sada ikoniek:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Zmazať správu dňa (MOTD)"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Zmazať správu dňa"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Zmazať správy dňa"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Zakázať"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Zamietnuť autorizáciu od kontaktu, nebude tým pádom vedieť, kedy ste "
 "pripojený(á)"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Oddelenie:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Zobraziť avatarov kontaktov v zozname"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Zobraziť stavovú správu kontaktov v zozname"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "Každých 5 _minút"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Upraviť skupiny"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Upraviť osobné informácie..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Upraviť _Skupiny"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Sada emotikonov:"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Povoliť"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Vložte ešte raz pre potvrdenie:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Vložte nové heslo:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Udalosti"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "Každých 5 _minút"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Extra adresa:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Priezvysko:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Prenos súborov"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "Prenos _súborov"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Správca súborov:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Filter:"
@@ -2415,39 +2445,35 @@ msgid "Font style:"
 msgstr "Štýl fontu:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Font:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Odmietnuť zobraziť stav"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Formát: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Často kladené otázky (FAQ - online)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "Ch_oď"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Úprava tém Gajimu"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2457,7 +2483,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:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2465,7 +2491,7 @@ msgstr ""
 "Gajim automaticky zobrazí novo prijaté správy v okne alebo v záložke "
 "existujúceho okna"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2474,7 +2500,7 @@ msgstr ""
 "Gajim vás bude upozorňovať na nové správy cez popup v pravej spodnej časti "
 "obrazovky"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2482,7 +2508,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:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2490,25 +2516,33 @@ msgstr ""
 "Gajim vás bude upozorňovať popup v pravej spodnej časti obrazovky na "
 "kontakty, ktoré sa práve odpojili"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim bude len meniť ikony kontaktov, ktoré vám odoslali novú správu"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Pomocník - Tvorba účtu"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Všeobecné"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Meno:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Nič"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Skupina:"
@@ -2556,17 +2590,23 @@ 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:170
-msgid "If checked, Gajim will also have a trayicon"
-msgstr "Ak je zaškrtnuté, Gajim bude zobrazovať trayicon"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
+msgstr ""
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr "Ak je zaškrtnuté, Gajim bude zobrazovať avatarov v zozname"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať správu o stave kontaktov pod menom v "
 "zozname"
@@ -2648,8 +2688,9 @@ msgstr ""
 "kontakty akoby ste mali len jeden účet"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Prichádzajúca správa:"
+#, fuzzy
+msgid "Inactive"
+msgstr "Aktívne"
 
 #. 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:185
@@ -2685,39 +2726,57 @@ msgid "Location"
 msgstr "Miesto"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Správa"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Upraviť..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Upraviť účty"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Upraviť záložky"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Upraviť Proxy nastavenia"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Upraviť..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Prostredné meno:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "Mo_derátor"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Viac"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Meno:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2729,108 +2788,104 @@ msgstr ""
 "Podľa účtu\n"
 "Podľa typu"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Prezývka:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Nič"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Upozorni ma na kontakt, ktorý:"
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr "Upozorniť keď príde _Gmail e-mail"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "Operačný systém:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "Pri každej _správe"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 msgid "One message _window:"
 msgstr "Jedno _okno so správou:"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Otvoriť..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Odchádzajúca správa:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "He_slo:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Passfráza"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Heslo"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Pauza"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Osobné informácie"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Telefónne č.:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "Prehrať _zvuky"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Pozícia:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "PSČ:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Nastavenia"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Prefix:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "správa o stave"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Čas tlače:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Priori_ta:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2840,59 +2895,51 @@ msgstr ""
 "pripojených dvaja alebo viac klientov prostredníctvom jedného účtu; Klient s "
 "najvyššou priritou obdrží udalosť"
 
-#: ../src/gtkgui.glade.h:237
-msgid "Profile, Avatar"
-msgstr "Profil, Avatar"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Zostaviť požiadavku..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Posledné:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Registrovaný(á) k"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "_Odstrániť účet iba z Gajima"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Odstrániť účet z Gajima a zo _serveru"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Odstrániť prenos súboru zo zoznamu"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr "Odstrániť dokončené, zrušené a neúspešné prenosy súborov zo zoznamu"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Odpoveď na túto správu"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Návrat Pôvodného nastavenia farieb"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "Zd_roj:"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2906,167 +2953,159 @@ msgstr ""
 "so zdrojmi ako 'Doma' alebo 'V práci', v rovnakom čase. Zdroj z najvyššou "
 "prioritou získava udalosti (viď nižšie)"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Zdroj:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Rola:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Konfigurácia miestnosti"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Miestnosť:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Uložiť _passfrázy (nie je bezpečné)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr "Uložiť _pozíciu a veľkosť zoznamu a diskusného okna"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Uložiť ako..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Uložiť _záznam z rozhovoru pre všetky účty"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Uložiť hes_lo"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "Poš_li"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Poslať súbor"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Poslať jednoduchú _správu"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Poslať _súbor"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Poslať _novú správu..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Poslať pakety na udržiavanie spojenia (keep-alive)"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Poslať správu"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Poslať správu a zatvoriť okno"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 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:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Vlastnosti servera"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Nastaviť správu dňa"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Nastaviť správu dňa"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Nastaviť _avatara"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Nastaviť avatara, keď som pripojený(á)"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Nastavovať správu dňa"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Zobraziť všetky čakajúce _udalosti"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Zobraziť _offline kontakty"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Zobraziť _zoznam"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Zobraziť _XML konzolu"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Zobraziť len v _zozname"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 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:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "Prihlásiť _sa"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "_Odhlásiť sa"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Zotriediť kontakty podľa stavu"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "S_tav"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Začať _rozhovor"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Stav:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Stav"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Správa o stave:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Stav:"
@@ -3097,25 +3136,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Syhch_ronizovať stav účtu s globálnym stavom"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Téma:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "Farba _textu:"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "_Písmo:"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "Správa pri automatickej zmene stavu na Preč"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "Správa pri automatickej zmene stavu na Neprítomný(á)"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Téma:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3141,50 +3181,56 @@ msgid "Type:"
 msgstr "Typ:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr "URL:"
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Podčiarknutie"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "Aktualizovať Správu dňa"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Aktualizovať Správu dňa"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Aktualizovať Správy dňa"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Použiť _SSL (historické dôvody)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "Použiť _transportnú sadu obrázkov"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Použiť autentifikáciu"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Použiť vlastné nastavenie server/port"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "zoznam prenosu súborov"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Ikonka v paneli (tj. v upozorňovacej oblasti)"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "Používateľské ID:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Keď je prenos súboru dokončené zobraziť popup upozornenie"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3197,21 +3243,21 @@ msgstr ""
 "Upozornenie na nové správy sa zobrazí len v prípade, že s kontaktom práve "
 "nediskutujete"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "Keď je prijatá nová udalosť"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Práca"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3219,414 +3265,454 @@ msgstr ""
 "Potrebujete mať účet, aby ste sa mohli pripojiť\n"
 "do Jabbrovskej siete."
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Vaše JID:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Akcie"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "_Pridať kontakt..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "_Pridať do zoznamu"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Administrátor"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "_Rozšírené"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Po čase:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Autorizovať"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "_Pozadie:"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Zakázať"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Pred časom:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "_Uložiť do záložiek túto miestnosť"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Prechádzať:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "_Kompaktný pohľad    Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Obsah dokumentácie"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "_Skopírovať JID/E-mailovú adresu"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Skopírovať odkaz"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Zakázať"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Preskúmať služby"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Preskúmať služby..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_Často kladené otázky"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Správca súborov:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Dokončiť"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Font:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "Skupinový rozhovor"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "_Zvýrazniť zle napísané slová"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_História"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Ikonka v paneli (tj. v upozorňovacej oblasti)"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovať udalosti od kontaktov, ktorí nie sú v zozname"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Prichádzajúca správa:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "_Pripojiť sa do novej miestnosti..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "_Vykopnúť"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "História _konverzácie"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "_Zaznamenať zmenu stavu kontaktu"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "_E-mailový klient:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Člen"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "_Zlúčiť účty"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Správa"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Upraviť"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "_Upraviť účet..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Meno:"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Nikdy"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "_Upozorni ma na to"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Upozorni ma, keď sa dokončí prenos"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "_Akcie člena"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "_Onlien používatelia"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Otvoriť nový e-mail"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Otvoriť vo web prehliadači"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Otvoriť..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Odchádzajúca správa:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "_Vlastník"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Pauza"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Prehrávač:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Popup"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Nastavenia"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Prítomnosť"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Zverejniť"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "_Odstrániť zo zoznamu"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Odpovedať"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Návrat Pôvodného nastavenia farieb"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Získať"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Heslo:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Hľadať"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "_Poslať"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "_Poslať a zatvoriť"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "_Poslať súkromnú správu"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "_Poslať serverovú správu"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "_Poslať jednoduchú správu"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Zotriediť kontakty podľa stavu"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "_Začať rozhovor"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Stav"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Správa o stave:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Zapísať"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Požiadavky"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Použiť proxy"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "_Používateľské meno"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Hlas"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "_XML konzola"
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "zoznam prenosu súborov"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "minuty"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Chyba čítania súboru:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Chyba štruktúry súboru:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 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ť."
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Hľadať"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Zmazať správu dňa (MOTD)"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Hľadať"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "vytváranie záznamov databáz"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3635,38 +3721,38 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Presun záznamov histórie..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Dátum"
@@ -3700,74 +3786,80 @@ msgstr "Stav je teraz: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Stav je teraz: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Správa"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Začať rozhovor s účtom %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Spojiť účty"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 msgid "Observers"
 msgstr "Pozorovatelia"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Už ste v miestnosti %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Nemôžete sa pripojiť do miestnosti, pokiaľ ste neviditeľný(á)"
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "_Pripojiť do novej miestnosti"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Spravovať záložky..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "pre %s účet"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "použiť %s účet"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "použiť %s účet"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Spravovať záložky..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "pre účet %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_História"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "_Pripojiť do novej miestnosti"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude odstránený"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3775,67 +3867,76 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy k tomuto kontaktu cez tento "
 "transport."
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Priradiť OpenPGP kľúč"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Vybrať kľúč a aplikovať ho na kontakt"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr "Chce si vás pridať do svojho zoznamu"
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "Preme_novať"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "_Prihlásiť"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "_Odhlásiť"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "_Zmeniť správu o stave"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Od teraz  bude \"%s\" vidieť váš stav."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, 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:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "Autorizácia bola odstránená"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Odteraz \"%s\" vás uvidí len v stave offline."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+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:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3843,37 +3944,37 @@ 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:1632
+#: ../src/roster_window.py:1780
 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:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Passfráza je požadovaná"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Vložiť passfrázu GPG kľúč pre účet %s"
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Uložiť passfrázu"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Passfráza"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 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:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3882,53 +3983,49 @@ msgstr ""
 "skupinových diskusií. Ste si skutočne istý(á), že chcete zmeniť stav na "
 "neviditeľný?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 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:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Máte neprečítané správy"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 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:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Od %s v miestnosti %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Poslať súbor kontaktu"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Zmeniť Správu o stave..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Zmeniť správu o stave..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Ukryť toto menu"
 
-#: ../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"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
@@ -3936,7 +4033,7 @@ msgstr[0] "Gajim - %d neprečítaná správa"
 msgstr[1] "Gajim - %d neprečítaných správ"
 msgstr[2] ""
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
@@ -3944,7 +4041,7 @@ msgstr[0] "Gajim - %d neprečítaná jednoduchá správa"
 msgstr[1] "Gajim - %d neprečítané jednoduché správy"
 msgstr[2] ""
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
@@ -3952,7 +4049,7 @@ msgstr[0] "Gajim - %d neprečítaná správa zo skupinovej diskusie"
 msgstr[1] "Gajim - %d neprečítané správy zo skupinovej diskusie"
 msgstr[2] ""
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
@@ -3960,96 +4057,88 @@ msgstr[0] "Gajim - %d neprečítaná súkromná správa"
 msgstr[1] "Gajim - %d neprečítané súkromné správy"
 msgstr[2] ""
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Rola:"
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Pripojenie:"
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Stav:"
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Zdroj:"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Stav:"
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Zápis:"
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "Základná _sada ikoniek:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Veľkosť: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Typ: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Veľkosť:"
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Typ: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Prenesené:"
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Nezačal"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Zastavený"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Dokončený"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Pauza"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Uviaznutý"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Prenášanie"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Táto služba neodpovedala podrobnejšími informáciami"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4057,33 +4146,33 @@ msgstr ""
 "Táto služba neodpovedala podrobnejšími informáciami.\n"
 "Je pravdepodobne zastaralá alebo poškodená"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Vybrať avatara"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Obrázky"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "?Klient: Neznámy"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámy"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Prechádzanie %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4091,7 +4180,7 @@ msgstr ""
 "Tento kontakt sa zaujíma o vaše informácie o prítomnosti, ale vy sa "
 "nezaujímate o jeho/jej informácie o prítomnosti"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4099,14 +4188,14 @@ msgstr ""
 "Zaujímate sa o informácie o prítomnosti vášho kontaktu, ale on/ona sa "
 "nezaujíma o vaše"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Vy aj váš kontakt sa vzájomne zaujímate o informácie o vašej a jeho/jej "
 "prítomnosti"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4114,23 +4203,23 @@ msgstr ""
 "Nezaujímate sa o informácie o prítomnosti vášho kontaktu a ani on/ona sa "
 "nezaujíma o vaše"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čakáte na odpoveď od kontaktu - ohľadne vašej požiadavky na zápis"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr "priorita zdroja"
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr "Bez pripojenie nemôžete publikovať informácie o vašom kontakte."
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "Bez pripojenia, nemôžete získať informácie o kontakte."
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 msgid "Personal details"
 msgstr "Osobné detaily"
 
@@ -4174,45 +4263,47 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus nie je prítomný na tomto stroji alebo chýba modul pre Python"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "Session bus nie je prístupný"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Použiť DBus a Notification-Daemon pre zobrazenie upozornení"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas v minútach, po ktorých sa zmení stav na Preč."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Preč ako výsledok nečinnosti"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Čas v minútach, po ktorých sa zmení stav na Neprítomný(á)"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Neprítomný(á) ako výsledok nečinnosti"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ak je pravda, neodstaňuj */_ .  Takže *abc* bude tečné a * * nebude "
 "odstránené."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Pridať * a [n] do titulku zoznamu?"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4220,11 +4311,11 @@ msgstr ""
 "Koľko riadkov si pamätať z predchádzajúceho rozhovoru, keď bude okno/záložka "
 "znovu otvorená."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Koľko minút má mať posledný riadok z poslednej konverzácie."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4232,20 +4323,20 @@ msgstr ""
 "Poslať správu pri stlačení Ctrl+Enter a pri Enter spraviť nový riadok "
 "(chovanie podobné ako Mirabilis ICQ klient)"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Koľko riadkov posunúť pri stlačení Ctrl+šípka hore."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Použiť kompaktný pohľad pri otvorení nového diskusného okna"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Použiť kompaktný pohľad pri otvorení okna skupinovej diskusie"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4254,52 +4345,52 @@ msgstr ""
 "Ani url s %s kde je %s slovo/fráza alebo 'WIKTIONARY' čo znamená použitie "
 "wiktionary."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ak je zaškrtnuté, Gajim môže byť ovládaný na diaľku s použitím gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spýtať sa pred zatvorením okna/záložky pre skupinovú diskusiu."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Spýtať sa pred zatvorením okna/záložky pre skupinovú diskusiu."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Spýtať sa pred zatvorením okna/záložky pre skupinovú diskusiu."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 msgstr "Potlačí server pre Prenos súborov, pri preklade/forwarde portu."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC štandard znamná KiB = 1024 bajtov, KB = 1000 bajtov."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Ukázať záložku len ak prebieha konverzácia?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Zobraziť okraj ak niekto konverzuje?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Zobraziť zatváracie tlačidlo v záložke?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -4307,7 +4398,7 @@ msgstr ""
 "Bodkočiarkou oddelený zoznam slov bude zvýraznený rozhovore s viacerými "
 "používateľmi."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4315,11 +4406,11 @@ msgstr ""
 "Ak je pravda, Gajim skončí keď bude X tlačidlo vo Window manažéri stlačené. "
 "Toto nastavenie je použíté, len v prípade, že sa používa trayicon. "
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Ak je pravda, Gajim bude registrovaný pre xmpp:// pri každom spustení."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4327,7 +4418,7 @@ msgstr ""
 "Ak je pravda, Gajim zobrazí ikonku na každej záložke obsahujúcej neprečítané "
 "správy. Závisí na téme, ikonka môže byť animovaná."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4335,7 +4426,7 @@ msgstr ""
 "Ak je pravda, Gajim zobrazí stavovú správu, ak nie je prázdna, pre každý "
 "kontakt v zozname."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4344,7 +4435,7 @@ msgstr ""
 "avatara z posledného spojenia, alebo ak nie je cache príliš zastaralá."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4352,7 +4443,7 @@ msgstr ""
 "Ak nie je pravda, nebudete vidieť riadok o zmene stavu kontaktu a jeho/jej "
 "stavovú správu"
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4362,7 +4453,7 @@ msgstr ""
 "2.8, potom bude okno blikať (bežné správanie pre väčšinu Window manažérov), "
 "keď sa udeje nejaká udalosť."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
@@ -4371,7 +4462,7 @@ msgstr ""
 "chránenej heslom. Zmeňte túto možnosť na Vypnuté, aby sa neposielali "
 "informácie o prítomnosti v diskusnej skupine."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4390,14 +4481,25 @@ msgstr ""
 "zobrazené v samostatnom okne. Poznámka: pre aplikovanie zmeny tohoto "
 "nastavenia, je nutné reštartovať Gajim"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr "Ak je Vypnuté, neuvidíte avatarov v diskusnom okne"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Spiaci"
@@ -4466,182 +4568,98 @@ msgstr ""
 "Prehrať zvuk keď príde akákoľvek MUC správa (Toto nastavenie sa vzťahuje len "
 "na účet, ak notify_on_all_muc_message je pravda)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "zelená"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "obchod s potravinami"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "človek"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "námornícka"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "jednoduchá"
-
-#: ../src/common/connection.py:68
-msgid "Unable to load idle module"
-msgstr "Nie je možné nahrať idle modul"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Nie je možné vstúpiť do miestnosti"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "Pre vstup do miestnosti je požadované heslo."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Vstup do miestnosti vám bol zakázaný."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Takáto miestnosť neexistuje."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "Vytváranie miestností je obmedzené."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Musíte použiť vašu zaregistrovanú prezývku."
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Nie ste v zozname."
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-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:610 ../src/common/connection.py:2264
-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:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "sme prihlásení k %s"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "požiadavka na odhlásenie od %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "sme odhlásení od %s"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojenie s účtom \"%s\" bolo stratené"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 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:1464
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s nevyhovuje RFC špecifikácii. Nebude pridaný do vášho zoznamu. Použite "
-"nástroje na správu zoznamu, napríklad: http://jru.jabberstudio.org/ pre jeho "
-"odstránenie"
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Nesprávne heslo"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Nesprávne heslo"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie je možné pripojiť sa k \"%s\""
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Pripojený na server %s:%s s %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Skontrolujte svoje pripojenie alebo skúste neskôr"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentifikácia bola neúspešná s \"%s\""
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 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:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passfráza nebola zadaná"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, 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:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "neviditeľný"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Som %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Táto správa je šifrovaná]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4650,207 +4668,206 @@ msgstr ""
 "Predmet: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, 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:699
+msgid "I would like to add you to my roster."
+msgstr "Chcel by som si ťa pridať do môjho zoznamu."
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Nepovolený znak v mene účtu."
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Adresa serveru je požadovaná:"
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Nesprávny znak v mene servera."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Nepovolený znak v zdroji."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Zaneprázdnený"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_Neprítomný"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Neprítomný"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "_Chcem si podebatovať"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Chcem si podebatovať"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "_Prítomný"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Prítomný"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "Preč"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Preč"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "_Neviditeľný"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Neviditeľný"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "?kontakt má stav:Neznámy"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "?kontakt má stav:Chyba"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "?Zápis už máme:Nič"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "Pre"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "Od"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Oba"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "?Vyžiadať (zápis): Nič"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Zapísať"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "?Skupinová diskusia - rola: Nič"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Moderátori"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Návštevníci"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Návštevník"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "sleduje konverzáciu"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "robí niečo iné"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "píše správu..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "prestal písať správu"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "zatvoril okno alebo záložku"
 
@@ -4860,10 +4877,111 @@ msgstr "zatvoril okno alebo záložku"
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nie je možné otvoriť %s na čítanie"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "jednoduchá"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "azúrová"
 
+#~ msgid "Send"
+#~ msgstr "Poslať"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr "%(nickname)s v miestnosti %(room_name)s vám poslal(a) správu."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s vám poslal(a) správu."
+
+#~ msgid "GUI Migration failed"
+#~ msgstr "Migrácia prostredníctvo grafického rozhrania zlyhala"
+
+#~ msgid ""
+#~ "Logs migration through graphical interface failed. The migration process "
+#~ "will start in the background. Please wait a few minutes for Gajim to "
+#~ "start."
+#~ msgstr ""
+#~ "Migrácia záznamov konverzácie prostredníctvom grafického nástroja "
+#~ "neuspela. Proces migrácie bude spustený na pozadí. Prosím počkajte pár "
+#~ "minút, kým sa Gajim spustí."
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "Záznamy boli úspešne prenesené do databázy."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr "Ak je zaškrtnuté, Gajim bude zobrazovať trayicon"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Profil, Avatar"
+
+#~ msgid "_Online Users"
+#~ msgstr "_Onlien používatelia"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Začať rozhovor s účtom %s"
+
+#~ 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"
+
+#~ msgid "Size: "
+#~ msgstr "Veľkosť:"
+
+#~ msgid "Session bus is not available"
+#~ msgstr "Session bus nie je prístupný"
+
+#~ msgid "Unable to load idle module"
+#~ msgstr "Nie je možné nahrať idle modul"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Nie je možné vstúpiť do miestnosti"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Pre vstup do miestnosti je požadované heslo."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Vstup do miestnosti vám bol zakázaný."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Takáto miestnosť neexistuje."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "Vytváranie miestností je obmedzené."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Musíte použiť vašu zaregistrovanú prezývku."
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Nie ste v zozname."
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "Požadovaná prezývka je používaná alebo už je registrovaná iným členom.\n"
+#~ "Prosím zadajte inú prezývku:"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "sme prihlásení k %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "požiadavka na odhlásenie od %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "sme odhlásení od %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s nevyhovuje RFC špecifikácii. Nebude pridaný do vášho zoznamu. "
+#~ "Použite nástroje na správu zoznamu, napríklad: http://jru.jabberstudio."
+#~ "org/ pre jeho odstránenie"
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr "Redistračné informácie pre službu %s nedorazili včas"
+
 #~ msgid "Sound"
 #~ msgstr "Zvuk"
 
@@ -5018,9 +5136,6 @@ msgstr "azúrová"
 #~ msgid "with account "
 #~ msgstr "účet:"
 
-#~ msgid "New Message as %s"
-#~ msgstr "Nová správa ako %s"
-
 #~ msgid "Chat with"
 #~ msgstr "Rozprávať sa s"
 
diff --git a/po/sv/LC_MESSAGES/gajim.po b/po/sv/LC_MESSAGES/gajim.po
index ca26d4d4a..e7f206013 100644
--- a/po/sv/LC_MESSAGES/gajim.po
+++ b/po/sv/LC_MESSAGES/gajim.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the gajim package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2005.
 # 
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2006-03-07 04:49+0100\n"
 "Last-Translator: Oscar Hellström <oscar@oscarh.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -55,7 +55,7 @@ msgid "Hidden"
 msgstr "Dold"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -72,63 +72,60 @@ msgstr ""
 "Funktionen \"markera felstavade ord\" kommer inte att användas"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "En förbindelse är inte tillgänglig"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 msgid "Your message can not be sent until you are connected."
 msgstr "Ditt meddelande kan inte skickas förren du är ansluten."
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "Chatt"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "Chatt"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP kryptering"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s har inte meddelat en OpenPGP-nyckel, du har inte heller tilldelat en"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "Kryptering aktiverad"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "Kryptering deaktiverad"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "Inte i registret"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du mottog just ett meddelande från \"%s\""
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -136,20 +133,20 @@ msgstr ""
 "Om du stänger den här fliken och du har historik avslaget kommer meddelandet "
 "att förloras."
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Var %s _minut"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "Verksam"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "Händelse"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -197,153 +194,166 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP är inte användbart på den här datorn"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "Du är för närvarande ansluten till servern"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 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:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "För att ändra kontonamnet måste du vara frånkopplad"
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "Kontonamnet kan inte vara tomt."
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "Kontonamnet kan inte innehålla mellanslag."
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Ett Jabber-ID måste vara av formen \"användare@server\"."
 
-#: ../src/config.py:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "Ogiltig post"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "Inget sådant konto tillgängligt"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 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:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan inte redigera din personliga information utan en förbindelse."
 
-#: ../src/config.py:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "Lyckades inte hämta hemliga nycklar"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Det uppstod problem när dina hemliga OpenPGP-nycklar skulle hämtas."
 
-#: ../src/config.py:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP kryptering"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "Välj din OpenPGP-nyckel"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "Ingen nyckel vald"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "Redigera %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "Registrera till %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr "Ban-lista"
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 msgid "Member List"
 msgstr "Medlemslista"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 msgid "Owner List"
 msgstr "Ägarelista"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 msgid "Administrator List"
 msgstr "Administratörlista"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr "Anledning"
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 msgid "Role"
 msgstr "Roll"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 msgid "Banning..."
 msgstr "Bannlyser..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -351,11 +361,11 @@ msgstr ""
 "<b>Vem vill du bannlysa?</b>\n"
 "\n"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr "Lägger till medlem..."
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -363,21 +373,21 @@ msgstr ""
 "<b>Vem vill du göra till medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr "Lägger till ägare..."
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Vem vill du göra till ägare?</b>\n"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 msgid "Adding Administrator..."
 msgstr "Lägger till Administratör..."
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -385,7 +395,7 @@ msgstr ""
 "<b>Vem vill du göra till administratör?</b>\n"
 "\n"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -401,75 +411,85 @@ msgstr ""
 "4. domän (domänen i sig matchar, så gör även alla användare@domän,\n"
 "domän/resurs, eller adress som innehåller en underdomän."
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "Konto \"%s\" är anslutet till servern"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "Om du tar bort det kommer anslutningen att förloras."
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "Lösenord Krävs"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv in lösenordet för konto %s"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Konto \"%s\" är anslutet till servern"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "Om du tar bort det kommer anslutningen att förloras."
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "Nytt rum"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "Det här bokmärket har ogiltig data"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Fyll i server- och rumfälten eller ta bort det här bokmärket."
 
-#: ../src/config.py:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "Ogiltigt användarnamn"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr "Du behöver ange ett användarnamn för att konfigurera detta konto."
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 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:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lösenorden skrivna i båda fälten måste vara identiska."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "Ogiltigt Jabber-ID"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "Den här kontakten finns redan i ditt register."
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "Kontot har blivit tillagt"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -477,19 +497,19 @@ msgstr ""
 "Du kan ställa in avancerade alternativ genom att trycka på \"Avancerat\", "
 "eller senare genom att använda \"Redigera->Konton\" från huvudfönstret."
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "Ditt nya konto har skapats"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "Ett fel uppstod när kontot skulle skapas"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
 
@@ -548,163 +568,162 @@ msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python-bindningar saknas på den här datorn"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajims D-Bus-egenskaper kan inte användas"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "Kontaktens namn: <i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "Transporter"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "Grupp"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "Nyckel-ID"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "Kontaktnamn"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusmeddelande"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "Statusmeddelande"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Förinställda statusmeddelanden</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Skriv ditt nya statusmeddelande:"
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Fyll i informationen om kontakten du vill lägga till i konto %s"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Fyll i informationen om kontakten du vill lägga till"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Transporter"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Denna tjänst innehåller inga objekt att bläddra genom."
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "Kontakten finns redan i registret"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "Den här kontakten finns redan i ditt register."
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabberklient"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr "TACK:"
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 #, fuzzy
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Sist men inte minst vill vi tacka alla paketansvariga"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr ""
 "Christian Bjälevik <nafallo@magicalforest.se>\n"
 "Oscar Hellström <oscar@oscarh.net>"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Prenumerationsförfrågan för konto %s från %s"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prenumerationsförfrågan från %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 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:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Anslut till gruppchatt med konto %s"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "Anslut till gruppchatt"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 msgid "Invalid room or server name"
 msgstr "Ogiltigt rum- eller servernamn"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starta Chatt med konto %s"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "Starta Chatt"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -713,157 +732,164 @@ msgstr ""
 "skicka ett chattmeddelande till:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "Förbindelse inte tillgänglig"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 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:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "Du måste skriva in ett lösenord."
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "Kontakt Loggade In"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggade Ut"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "Nytt Meddelande"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "Nytt Enstaka Meddelande"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "Skicka Privat Meddelande"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "Förfrågan om Filöverföring"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "Fel i Filöverföring"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "Filöverföring Klar"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "Filöverföring Stoppad"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 msgid "New E-mail"
 msgstr "Ny E-post"
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "Förfrågan om Filöverföring"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "Fel i Filöverföring"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "Filöverföring Klar"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "Filöverföring Stoppad"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "?Gruppchatt kontaktroll:Ingen"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Enstaka Meddelande med konto %s"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "Enstaka meddelande"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "Skicka %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konsol för %s"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr "XML konsol"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "Bjöd in %(contact_jid)s till %(room_jid)s."
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "Välj ljud"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Wav-ljud"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "Andra"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "Konferens"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "Utan en förbindelse kan du inte bläddra bland tillgängliga tjänster"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Tjänstefinnaren använder %s konto"
@@ -872,11 +898,11 @@ msgstr "Tjänstefinnaren använder %s konto"
 msgid "Service Discovery"
 msgstr "Tjänstefinnare"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Denna tjänst kunde inte hittas"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -884,174 +910,175 @@ msgstr ""
 "Adressen du angav är ingen tjänstadress eller så svarar inte tjänsten. "
 "Kontrollera adressen och försök igen."
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Tjänst är inte bläddringsbar"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Denna typ av tjänst innehåller inga objekt att bläddra genom."
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "använder konto %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Denna tjänst innehåller inga objekt att bläddra genom."
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "Re_gistrera"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "_Anslut till"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Undersöker %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "Användare"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "Beskrivning"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "Fil"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "Förlopp"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnamn: %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "Storlek: %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "Avsändare: %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "Mottagare: "
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "Sparad i: %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Filöverföring färdig"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "_Öppna behållande mapp"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "Filöverföring avbruten"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "Förbindelse med motpart kan inte etableras."
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Filöverföring stoppad av motparten"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "Välj fil att skicka..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "Sänd"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "_Skicka"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim kan inte komma åt denna fil"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "Denna fil används av en annan process."
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "Den här filen finns redan"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 msgid "What do you want to do?"
 msgstr "Vad vill du göra?"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vill skicka en fil till dig:"
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "Spara fil som..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "Vill du skriva över den?"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1059,7 +1086,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
@@ -1076,12 +1103,12 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det är inte möjligt att skicka tomma filer"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "Namn: "
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "Sändare: "
 
@@ -1089,32 +1116,32 @@ msgstr "Sändare: "
 msgid "Pause"
 msgstr "Paus"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "_Fortsätt"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "visar hjälp för ett specifikt kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "visar hjälp för kommando"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "Visar eller gömmer registerfönstret"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "Öppnar ett fönster med nästa olästa meddelande"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -1122,43 +1149,43 @@ msgstr ""
 "Skriv ut en lista på alla kontakter i registret. Varje kontakt hamnar på en "
 "egen rad"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "visa bara kontakter för det givna kontot"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "Skriver ut en lista över registrerade konton"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "Ändrar status för konto eller konton"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "en av: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "meddelande"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "statusmeddelande"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -1166,20 +1193,20 @@ msgstr ""
 "ändra status för konto \"konto\". Om inte specificerad, försök ändra status "
 "på alla konton som har \"synka med global status\" satt"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Visa chattdialogen så att du kan skicka meddelanden till en kontakt"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "JID för kontakten som du vill chatta med"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "om specificerat tas kontakten bort från kontaktlistan för det här kontot"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1189,129 +1216,129 @@ msgstr ""
 "konto är valfria. Om du vill sätta bara \"konto\", utan \"OpenPGP-nyckel\", "
 "sätt bara \"OpenPGP-nyckel\" till \"\"."
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "JID för kontakten som kommer ta emot meddelandet"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "meddelandeinnehåll"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "pgp-nyckel"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "om specificerat kommer meddelandet bli krypterat med den här publika nyckeln"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "om specificerat kommer meddelandet bli skickat genom det här kontot"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "Hämta detaljerad information om kontakt"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "JID för kontakten"
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Hämta detaljerad information om kontakt"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "Du har inget aktivt konto"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "Skicka fil till en kontakt"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "Sökväg"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "om specificerat kommer filen bli skickad genom det här kontot"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "Listar alla inställningar och deras värden"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sätter värdet av \"nyckel\" till \"värde\"."
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "nyckel=värde"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "\"nyckel\" är namnet på inställningen, \"värde\" är värdet att sätta den till"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "Tar bort en inställning"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "nyckel"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "namnet på inställningen som skall tas bort"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver Gajims nuvarande inställningar till .config-filen"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "Ta bort en kontakt från register"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "Lägger till en kontakt till registret"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "Lägger till ny kontakt till detta kontot."
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerar nuvarande status (global status om inget konto specificerats)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Returnerar nuvarande statusmeddelande (det globala om inget konto "
 "specificerats)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "Du har olästa meddelanden"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "Saknar argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1320,16 +1347,16 @@ msgstr ""
 "\"%s\" finns inte i ditt register.\n"
 "Specificera konto för att skicka meddelandet."
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "Du har inget aktivt konto"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Okänd D-Busversion: %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1338,16 +1365,16 @@ msgstr ""
 "Användning: %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "Parametrar:"
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr "%s kunde inte hittas"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1356,7 +1383,7 @@ msgstr ""
 "Användning: %s kommando [parametrar]\n"
 "Kommando är en av:\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1365,31 +1392,31 @@ msgstr ""
 "Parameter \"%s\" är inte specificerad. \n"
 "Skriv \"%s help %s\" för mer info"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim behöver Xserver för att fungera. Avbryter..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim behöver PyGTK 2.6 eller senare"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim behöver PyGTK 2.6 eller senare för att fungera. Avbryter..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim behöver GTK 2.6 eller senare"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim behöver GTK 2.6 eller senare för att fungera. Avbryter..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime saknar libgladestöd"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1398,133 +1425,152 @@ msgstr ""
 "Vänligen ta bort din nuvarande GTK+ runtime och installera senaste stabila "
 "version från %s"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Vänligen kontrollera att GTK+ och PyGTK har libgladestöd i ditt system."
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim behöver PySQLite2 för att fungera"
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Auktorisering för %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "Accepterar du den här förfrågan?"
 
-#: ../src/gajim.py:498
-#, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "%(nickname)s i rum %(room_name)s har skickat dig ett meddelande."
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "Kontakt Loggade In"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s har skickat dig ett nytt meddelande."
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "Kontakt Loggade Ut"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "Skicka Privat Meddelande"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nytt Enstaka Meddelande"
+
+#: ../src/gajim.py:610
+#, fuzzy, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nytt meddelande som %s"
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "problem vid sändning"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "Auktorisering accepterad"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har auktoriserat dig att se hans eller hennes status."
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "Du kommer alltid se honom eller henne som frånkopplad."
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan inte etableras"
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "Kontrollera din förbindelse eller försök igen senare."
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s är nu %s (%s)"
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "Din lösenfras är inkorrekt."
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du är för närvarande ansluten utan din OpenPGP-nyckel."
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, fuzzy, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr "%(new_mail_gajim_ui_msg)s på %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1045
 #, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] "Du har %d oläst E-postmeddelanden"
 msgstr[1] "Du har %d olästa E-postmeddelanden"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr "%(new_mail_gajim_ui_msg)s på %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vill skicka en fil till dig."
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(filename)s har mattagits från %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Överföringen av %(filename)s från %(name)s har stannat."
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(filename)s har skickats till %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Överföringen av %(filename)s till %(name)s har stannat."
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr "publicering av vCard lyckades"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "Din personliga information har blivit publicerad"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "publicering av vCard misslyckades"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1534,162 +1580,144 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "Kunde inte spara dina inställningar"
 
-#: ../src/gajim.py:1719
-msgid "GUI Migration failed"
-msgstr "GUI Migration misslyckades"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-"Migration av logfiler genom grafiskt gränssnitt misslyckades. "
-"Migrationsprocessen kommer att startas i bakgrunden. Vänligen tillåt några "
-"minuter för Gajim att starta."
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "Migrationen av logfiler till databasen lyckades."
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management-stöd inte tillgängligt (saknar gnome.ui-modul)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "Migrerar Logfiler"
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "Vänligen vänta medans logfiler blir migrerade..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Tema"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "temanamn"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "Du kan inte ta bort ditt nuvarande tema"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "Vänligen välj ett annat tema först."
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "Privat chatt"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "Privat chatt"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "Skicka privat meddelande misslyckades"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, 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/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "Gruppchatt"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "Gruppchatt"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "Det här rummet har inget ämne"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blivit sparkad: %(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blivit sparkad av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst: %(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr "%s har lämnat"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s är nu %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Smeknamnet kunde inte hittas: %s"
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Bjöd in %(contact_jid)s till %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s verkar inte vara ett giltigt JID"
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Inget sådant kommondo: /%s (om du vill skicka detta, använd /say som prefix)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandon: %s"
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1702,7 +1730,7 @@ msgstr ""
 "befinner sig i rummet kommer han/hon/den/det också att att bli sparkad. "
 "Stödjer INTE mellanslag i smeknamn."
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1710,12 +1738,12 @@ msgstr ""
 "Användning: /%s <semknamn>, öppnar ett privat chattfönster till den "
 "specificerade deltagaren."
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Användning: /%s, tömmer fönstret från text."
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1724,12 +1752,12 @@ msgstr ""
 "Användning: /%s [anledning], stänger aktuellt fönster eller flik och visar "
 "anledning om sådan specificerades."
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Användning: /%s, ställer om ett gruppchatfönster till kompaktvy."
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1738,7 +1766,7 @@ msgstr ""
 "Användning: /%s <JID> [anledning], bjuder in JID till aktivt rum med en "
 "valbar anledning."
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1747,7 +1775,7 @@ msgstr ""
 "Användning: /%s <rum>@<server>[/smeknamn], erbjuder att delta i rum@server "
 "med valbart smeknamn"
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1757,7 +1785,7 @@ msgstr ""
 "Användning: /%s <smeknamn> [anledning], tar bort medlemmen specificerad med "
 "smeknamn och visar en valbar anledning. Stödjer INTE mellanslag i smeknamnet."
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1766,7 +1794,7 @@ msgstr ""
 "Användning: /%s <handling>, skickar handling till aktivt rum. Använd tredje "
 "person. (t.ex. /%s exploderar.)"
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -1775,17 +1803,17 @@ msgstr ""
 "Användning /%s <smeknamn> [meddelande], öppnar ett privat meddelandefönster "
 "och skickar ett meddelande till medlemmen specificerad med smeknamn."
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Användning /%s <smeknamn>, byter ditt smeknamn i aktivt rum."
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Användning /%s [ämne], visar eller uppdaterar nuvarande ämne."
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -1793,71 +1821,71 @@ msgstr ""
 "Användning: /%s <meddelande>, skickar meddelande utan att leta efter andra "
 "kommandon."
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjälp för /%s"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "Är du säker på att du vill lämna rum \"%s\"?"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr ""
 "Om du stänger det här fönstret kommer du bli frånkopplad från det här rummet."
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "Fråga mig i_nte om att stänga \"%s\" igen"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "Ändrar Ämne"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "Ange det nya ämnet:"
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "Byter Smeknamn"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "Ange det nya smeknamnet du vill använda:"
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "Bokmärke finns redan"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "Rummet \"%s\" finns redan i dina bokmärken."
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "Bokmärke har blivit ordentligt tillagt"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Du kan hantera dina bokmärken via åtgärdsmenyn i ditt register."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparkar %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "Du kan ange en orsak här under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
@@ -1905,111 +1933,120 @@ msgstr "<b>Avancerad konfigurationsredigerare</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Program</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>Anpassa</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>Beskrivning</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>Format av en rad</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Gränssnittsanpassning</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabbertrafik</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diverse</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig Information</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Vänligen välj ett av alternativen nedan:</b>"
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Vänligen fyll i informationen för ditt nya konto</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>Vänligen välj ett av alternativen nedan:</b>"
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Förinställda statusmeddelanden</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>Egenskaper</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>Inställningar</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>Ljud</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Skriv ditt nya statusmeddelande:"
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuella Meddelanden</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Vad vill du?</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>XML inskrivning</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "En lista på aktiva, kompletta och stoppade filöverföringar"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "_Konton"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "Efter smeknamn:"
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "Om"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "Acceptera"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "Konto"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -2021,52 +2058,44 @@ msgstr ""
 "Kontakt\n"
 "Banner"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "Kontomodifiering"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "Konton"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "A_vancerade åtgärder"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "Lägg till ny kontakt"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>Visuella Meddelanden</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "Lägg till _kontakt"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "Adress"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "Avancerad"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "Avancerad konfigurationsredigerare"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "Efter smeknamn:"
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "Efter tid:"
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2076,56 +2105,56 @@ msgstr ""
 "Författande enbart\n"
 "Frånslagen"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "Tillåt _OS-information att skickas"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "Tillåt henne/honom att se min status"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Tillåt popup/meddelanden när jag är bort_a/inte tillgänglig/upptagen/osynlig"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "Också känt som iChat-stil"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "Fråga efter statusmeddelande när jag:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "Be om att få se hans/hennes status"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "Fråga:"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "Tilldela Open_PGP-nyckel"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Auktorisera kontakt så han kan veta när du är ansluten"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "Automatiskt bort_a efter:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "Automatiskt ej tillgä_nglig efter:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "Anslut automatiskt"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2137,15 +2166,15 @@ msgstr ""
 "Använd alltid KDEs standardprogram\n"
 "Anpassa"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "Auktorisera kontakt automatiskt"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "Återanslut när anslutningen förloras"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2158,13 +2187,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "Före smeknamn:"
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "Före tid:"
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "Före smeknamn:"
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2279,133 +2305,137 @@ msgid "Company:"
 msgstr "Företag:"
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "Konfigurera _rum"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "Anslut när jag trycker Slutför"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "Förbindelse"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "Kontaktinformation"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "Kontakt_info"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "Konversationshistorik"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "Land:"
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "Standard _statusikonuppsättning:"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "Radera MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "Radera dagens meddelande"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "Raderar dagens meddelande"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "Neka"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Avvisa auktorisering från kontakt så att han inte kan veta när du är ansluten"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "Avdelning:"
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "Visa avatarer för kontakter i registret"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "Visa statusmeddelanden för kontakter i registret"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "E-post:"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "Var 5:e _minut"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "Redigera grupper"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "Redigera personlig information..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "Redigera _grupper"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "Uppsättning känsloikoner:"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "Aktivera"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "Skriv in det igen för att bekräfta:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "Skriv nytt lösenord:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "Händelser"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "Var 5:e _minut"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "Extra adress:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "Efternamn:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "Filöverföringar"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "_Filöverföringar"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "Filhanterare:"
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "Filter:"
@@ -2415,39 +2445,35 @@ msgid "Font style:"
 msgstr "Teckensnitt-stil:"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "Teckensnitt:"
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "Förbjud henne/honom att se min status"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: ÅÅÅÅ-MM-DD"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "Vanliga frågor (webb)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "Från:"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "Kör"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Gajim Temaanpassare"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2457,7 +2483,7 @@ msgstr ""
 "Gajim kan skicka och ta emot meta-information relaterad till en konversation "
 "som du kan ha med en kontakt"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
@@ -2465,7 +2491,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:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
@@ -2474,7 +2500,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:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2482,7 +2508,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:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2490,26 +2516,34 @@ 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:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 "Gajim kommer ändra ikonen på kontakten som skickade det nya meddelandet"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Första-gången guide"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "Generellt"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "Förnamn:"
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "Ingen"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "Grupp:"
@@ -2557,18 +2591,24 @@ 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:170
-msgid "If checked, Gajim will also have a trayicon"
-msgstr "Om ikryssat kommer Gajim också att ha en aktivitetsfältsikon"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
+msgstr ""
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 "Om ikryssad kommer Gajim att visa kontakters avatarer i registerfönstret"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr ""
 "Om ikryssad kommer Gajim att visa statusmeddelanden för kontakter under "
 "kontaktens namn i register-fönstret"
@@ -2650,8 +2690,9 @@ msgstr ""
 "alla kontakter som om du hade ett konto"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "Inkommande meddelande:"
+#, fuzzy
+msgid "Inactive"
+msgstr "Verksam"
 
 #. 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:185
@@ -2687,39 +2728,57 @@ msgid "Location"
 msgstr "Plats"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "Meddelande"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "Hantera..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "Hantera konton"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "Hantera bokmärken"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "Hantera proxyprofiler"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "Hantera..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "Mellannamn:"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "Mer"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "Namn:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2731,108 +2790,104 @@ msgstr ""
 "Per konto\n"
 "Per typ"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "Smeknamn:"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "Meddela mig om kontakter som: "
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr "Meddela om ny _Gmail e-post"
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "Vid varje _meddelande"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 msgid "One message _window:"
 msgstr "Ett meddelandefönster:"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "Öppna..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "Utgående meddelande:"
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "Lösen_ord:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "Lösenfras"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "Pausad"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "Personlig Information"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "Telefonnr.:"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "_Spela ljud"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "Position:"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "Postnummer:"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "Inställningar"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "Prefix:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "statusmeddelande"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "Skriv ut tid:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "Priori_tet:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2842,59 +2897,51 @@ 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:237
-msgid "Profile, Avatar"
-msgstr "Profil, avatar"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "Frågebyggare..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "Nyligen:"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "Registrera till"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "Ta bort konto enbart från Gajim"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "Ta bort konto från Gajim och från _servern"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "Ta bort filöverföring från listan."
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr "Tar bort klara, avbrutna och felaktiga filöverföringar från listan"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "Svara på detta meddelande"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "Återställ till standardfärgerna"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "Resur_s: "
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2908,168 +2955,160 @@ msgstr ""
 "och \"Jobb\" samtidigt. Resursen med högst prioritet kommer få händelserna. "
 "(se undertill)"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "Resurs:"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "Roll:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "Rumkonfiguration"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "Spara _lösenfras (osäkert)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr "Spara _position och storlek för register- och chattfönster"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Spara fil som..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "Spara konversations_loggar för alla kontakter"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "Spara lösen_ord"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 msgid "Search"
 msgstr "Sök"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "Skick_a"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "Skicka fil"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "Skicka enstaka _meddelande"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "Skicka _fil"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "Skicka _Nytt Meddelande..."
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "Skicka håll-vid-liv paket"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "Skicka meddelande och stäng fönster"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 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:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "Serverns funktioner"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "Ställ in MOTD"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "Ställ in dagens meddelande"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "Ställ in _Avatar"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "Välj en avatar när jag ansluter"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "Ställer in dagens meddelande"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "Visa Alla Väntande Händelser"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "Visa _frånkopplade kontakter"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "Visa _registret"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "Visa _XML konsol"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "Visa enbart i _registret"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 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:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "Loggar _in"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "Loggar _ut"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "Sortera kontakter efter status"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "Starta _Chatt"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "Delstat:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "Statusmeddelande:"
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "Status:"
@@ -3100,25 +3139,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "Synk_ronisera kontostatus med global status"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "Tema:"
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "Textfärg:"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "Text-teckensnitt:"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "Det automatiska borta statusmeddelandet"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "Det automatiska inte tillgänglig statusmeddelandet"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "Tema:"
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3144,52 +3184,58 @@ msgid "Type:"
 msgstr "Typ:"
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr "URL:"
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "Understrykning"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "Uppdatera MOTD"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "Uppdatera dagens meddelande"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "Uppdaterar dagens meddelande"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "Använd _SSL (föråldrat)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr ""
 "Använd _transporternas\n"
 "ikonuppsättningar"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "Använd autentisering"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "Använd anpassat värdnamn/port"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "filöverföringslista"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "_Ikon i aktivitetsfältet (aka. notifieringsyta)"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "Användar-ID:"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr "När en filöverföring är färdig, visa ett popupmeddelande"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3202,21 +3248,21 @@ msgstr ""
 "händelser genereras endast vid ett nytt meddelande från en kontakt du inte "
 "redan chattar med"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "När en ny händelse är mottagen"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "Jobb"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3224,415 +3270,455 @@ msgstr ""
 "Du behöver ett konto för att kunna ansluta till\n"
 "Jabber-nätverket."
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "Ditt JID:"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "_Åtgärder"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "_Lägg till kontakt..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "_Lägg till registret"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "_Adress:"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "_Administratör"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "_Avancerat"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "Efter tid:"
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "_Auktorisera"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "_Bakgrund:"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "_Bannlys"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "Före tid:"
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "_Bokmärk det här rummet"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "_Webbläsare:"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "_Kompakt vy Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiera JID/e-postadress"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "_Kopiera länkadress"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "_Neka"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "_Upptäck tjänster"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "_Upptäck tjänster"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "Filhanterare:"
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "_Slutför"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "Teckensnitt:"
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "_Gruppchatt"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "_Markera felstavade ord"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "_Historik"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "_Ikon i aktivitetsfältet (aka. notifieringsyta)"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 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:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "Inkommande meddelande:"
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "Anslut till nytt _rum..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "_Sparka ut"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "_Logga konversationshistorik"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "_Logga statusändringar hos kontakter"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "_E-postklient:"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "Sa_mmanfoga konton"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "_Modifiera"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "_Redigera Konto..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "_Namn: "
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "_Aldrig"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "_Meddela mig om det"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Meddela mig när en filöverföring är färdig"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "_Innehavarhandlingar"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "_Anslutna användare"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "_Öppna e-postförfattning"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "_Öppna länk i webbläsare"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "Öppna..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "Utgående meddelande:"
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "_Ägare"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "_Lösenord:"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "_Paus"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "_Spelare:"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "_Öppna det"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "_Inställningar"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "_Närvaro"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "_Publicera"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "Ta _bort"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "Ta bo_rt från register"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "Byt _namn"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "_Svara"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "Återställ till standardfärgerna"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "_Hämta"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "_Lösenord:"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "_Sök"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "_Skicka"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "_Skicka & stäng"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "_Skicka privat meddelande"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "_Skicka servermeddelande"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "_Skicka enstaka meddelande"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "Sortera kontakter efter status"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "_Starta chatt"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "Statusmeddelande:"
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "_Prenumeration"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "_Använd proxy"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "_Användarnamn:"
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "_Röst"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "_XML konsol..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "filöverföringslista"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "minuter"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fel: kan inte öppna %s för läsning"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "Fel vid läsning av fil:"
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "Fel vid parsning av fil:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Kunde inte skriva till %s. Session Management-stöd kommer inte att fungera"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "_Sök"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "Radera MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "_Sök"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "skapar logdatabas"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3641,36 +3727,36 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Migrerar Logfiler"
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "Datum"
@@ -3704,74 +3790,80 @@ msgstr "Status är nu: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status är nu: %(status)s"
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "Meddelande"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "Starta Chatt med konto %s"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "Sammanfoga konton"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 msgid "Observers"
 msgstr "Observerande"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "Du är redan i rummet %s"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "Du kan inte ansluta till ett rum när du är osynlig"
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "Anslut till nytt _rum"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "Hantera bokmärken..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "till %s konto"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "använder %s konto"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "använder konto %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "Hantera bokmärken..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "för konto %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "_Historik"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "Anslut till nytt _rum"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3779,69 +3871,78 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "från denna transport."
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "Tilldela OpenPGP-nyckel"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "Välj en nyckel att tilldela kontakten"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 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:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "Döp om"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "Ans_lut"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "K_oppla från"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "Byt _Statusmeddelande"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "Auktorisering har sänts"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Om \"%s\" accepterar din förfrågan kommer du att känna till hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "Auktorisering har tagits bort"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu kommer \"%s\" alltid se dig som offline."
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" kommer bli borttagen från registret"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen. "
+"Kontakten kommer alltid se dig som frånkopplad."
+
+#: ../src/roster_window.py:1779
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3849,39 +3950,39 @@ msgstr ""
 "Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen. "
 "Kontakten kommer alltid se dig som frånkopplad."
 
-#: ../src/roster_window.py:1632
+#: ../src/roster_window.py:1780
 msgid "I want this contact to know my status after removal"
 msgstr ""
 "Jag vill att denna kontakten skall känna till min status även efter "
 "borttagningen"
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "Lösenfras krävs"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, 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:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "Spara lösenfras"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Lösenfras"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "Du deltar i en eller flera guppchatter"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3889,19 +3990,19 @@ msgstr ""
 "Om du byter status till osynlig kommer du att förlora anslutningen till "
 "gruppchatterna. Är du säker på att du vill byta status till osynlig?"
 
-#: ../src/roster_window.py:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 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:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3909,151 +4010,139 @@ msgstr ""
 "Meddelanden kommer bara vara tillgängliga för läsning senare om du har "
 "historik påslagen."
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Från %s i rum %s"
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Skicka fil till en kontakt"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "Byt Statusmeddelande..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Byt Statusmeddelande..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "Gömmer denna meny"
 
-#: ../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"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - ett oläst meddelande"
 msgstr[1] "Gajim - %d olästa meddelanden"
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - ett oläst enstaka meddelande"
 msgstr[1] "Gajim - %d olästa enstaka meddelanden"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - ett oläst gruppchatmeddelande"
 msgstr[1] "Gajim - %d olästa gruppchatmeddelanden"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - ett oläst privat meddelande"
 msgstr[1] "Gajim - %d olästa privata meddelanden"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "Roll: "
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "Anknytning: "
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "Status: "
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "Prenumeration: "
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "Standard _statusikonuppsättning:"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "Storlek: %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "Typ: "
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "Nerladdning"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "Uppladdning"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "Storlek: "
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "Typ: "
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "Överfört: "
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "Inte startad"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "Färdig"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "Pausad"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "Avstannad"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "Överför"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "Denna tjänst har ännu inte svarat med detaljerad information"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -4061,33 +4150,33 @@ msgstr ""
 "Denna tjänst kunde inte svara med detaljerad information.\n"
 "Tjänsten är antagligen föråldrad eller trasig."
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "Välj avatar"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "Bilder"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "?Klient:Okänd"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "?OS:Okänt"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Bläddrar %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4095,7 +4184,7 @@ msgstr ""
 "Denna kontakt är intresserad av din närvaroinformation, men du är inte "
 "intresserad av hans/hennes"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4103,35 +4192,35 @@ msgstr ""
 "Du är intresserad av denna kontakts närvaroinformation, men han/hon är inte "
 "intresserad av din"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Du och kontakten är intresserade av varandras närvaroinformation"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Varken du eller kontakten är intresserad av varandras närvaroinformation"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du väntar på kontaktens svar på din förfrågan om prenumeration"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr "Utan en förbindelse kan du inte publicera din kontaktinformation."
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "Utan en förbindelse kan du inte hämta din kontaktinformation."
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 msgid "Personal details"
 msgstr "Personliga detaljer"
 
@@ -4174,44 +4263,46 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus finns inte på den här maskinen eller så saknas pythonmodulen"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "Sessionsbus inte tillgänglig"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Använd DBus och Notification-Daemon för att visa meddelanden"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minuter tills din status ändras till borta."
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "Borta på grund av inaktivitet"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minuter tills din status ändras till inte tillgänglig."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "Inte tillgänglig på grund av inaktivitet"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Om True tas inte */_ bort. *abc* blir fetstil men * * / / _ _ inte borttagna."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "Lägg till * och [n] i registerfönstrets titel."
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -4219,12 +4310,12 @@ msgstr ""
 "Hur många rader som skall kommas ihåg från tidigare konversation när en "
 "chatt-flik/fönster öppnas igen."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Mur många minuter skall de sista raderna från tidigare konversation sparas."
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -4232,20 +4323,20 @@ msgstr ""
 "Skicka meddelande med Ctrl+Enter och gör radbryt med Enter (Mirabilis ICQ "
 "Klientens standardbeteende)."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hur många rader skall sparas för Ctrl+KeyUP."
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "Använd kompaktvy när ett chattfönster öppnas"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "Använd kompaktvy när ett gruppchattfönster öppnas"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4254,29 +4345,29 @@ msgstr ""
 "Skriv in url med %s i där %s är ordet/frasen eller 'WIKTIONARY' vilket "
 "betyder att wiktionary skall användas."
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Om ikryssad kan Gajim bli fjärrstyrd med gajim-remote."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fråga innan gruppchattflik eller -fönster stängs."
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Fråga innan gruppchattflik eller -fönster stängs."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "Fråga innan gruppchattflik eller -fönster stängs."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -4284,29 +4375,29 @@ msgstr ""
 "Åtsidosätter vilket värdnamn vi skickar vid filöverföring, t.ex. vid NAT och "
 "port forwarding."
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standarden säger att KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "Visa flik när endast en konversation är aktiv?"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "Visa flikkant om endast en konversation är aktiv?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "Visa stängknapp i flik?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr "En semikolonseparerad lista av ord som blir upplysta i gruppchatt."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4314,11 +4405,11 @@ msgstr ""
 "Om True avslutar Gajim när fönsterhanterarens X-knapp trycks på. Denna "
 "inställning behandlas bara när aktivitetsfältet används."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Om True registreras Gajim för xmpp:// vid varje uppstart."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4326,7 +4417,7 @@ msgstr ""
 "Om True kommer Gajim att visa en ikon på varje flik som innehåller olästa "
 "meddelanden. Beroende på tema kan denna ikon vara animerad."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4334,7 +4425,7 @@ msgstr ""
 "Om True kommer Gajim att visa statusmeddelande, om inte tomt, för varje "
 "kontakt under dess namn i registerfönstret"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -4343,7 +4434,7 @@ msgstr ""
 "avatar, eller som har en för gammal cachad avatar om deras nuvarande avatar."
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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."
@@ -4351,7 +4442,7 @@ msgstr ""
 "Om False kommer du inte längre att se en statusrad i chattfönstret när en "
 "kontakt byter hans eller hennes status och/eller statusmeddelande."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -4361,7 +4452,7 @@ msgstr ""
 "blinka (standardbeteende i de flesta fönsterhanterare) när det finns "
 "väntande händelser."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
@@ -4370,7 +4461,7 @@ msgstr ""
 "lösenordsskyddat rum. Sätt denna inställning till False för att inte skicka "
 "SHA-info i gruppchattnärvaroinformation"
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4388,14 +4479,25 @@ msgstr ""
 "visas i ett specifikt fönster. OBS: Gajim måste startas om för att denna "
 "inställning skall börja gälla."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr "Of False kommer du inte längre att se avatarer i chattfönstret"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "Sover"
@@ -4464,182 +4566,97 @@ msgstr ""
 "Ljud att spela när MUC-meddelande anländer. (Denna inställning behandlas "
 "endast om notify_on_all_muc_messages är satt till True)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "grön"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "grönsaker"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "mänsklig"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "marin"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "enkel"
-
-#: ../src/common/connection.py:68
-msgid "Unable to load idle module"
-msgstr "Lyckades inte ladda tomgångsmodul"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "Lyckades inte gå med i rummet"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "Det krävs en lösenfras för att ansluta till detta rum."
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "Du är bannlyst från detta rummet."
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "Det finns inget sådant rum."
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "Möjligheten att skapa rum är begränsad."
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "Ditt registrerade smeknamn måste användas."
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "Du är inte med i medlemslistan."
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Ditt önskade smeknamn används redan eller är registrerat av en annan "
-"deltagare.\n"
-"Vänligen ange ett annat smeknamn nedan:"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-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:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr "vi prenumererar nu på %s"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "avprenumerationsförfrågan från %s"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "vi prenumererar inte längre på %s"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Anslutningen med konto \"%s\" har brutits"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 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:1464
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s följer inte RFC. Dt kommer inte att läggas till till ditt register. "
-"Använd registerhanteringsverktyg så som http://jru.jabberstudio.org/  för "
-"att ta bort det"
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "Ogiltigt lösenord"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "Ogiltigt lösenord"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunde inte ansluta till \"%s\""
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Ansluten till server %s:%s med %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "Kontrollera din förbindelse eller försök igen"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggning misslyckades med \"%s\""
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 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:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "Lösenordsfras för OpenPGP angavs inte"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, 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:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "osynlig"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "frånkopplad"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "Jag är %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[Det här meddelandet är krypterat]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4648,207 +4665,206 @@ msgstr ""
 "Ämne: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registreringsinformation för transport %s har inte kommit fram i tid"
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
+msgstr "Jag skulle vilja lägga till dig i mitt register."
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "Ogiltigt tecken i användarnamn"
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "Serveradress krävs."
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "Ogiltigt tecken i värdnamn."
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "Ogiltigt tecken i resurs."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "_Upptagen"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "_Inte tillgänglig"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "Inte tillgänglig"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "_Ledig för chatt"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "Ledig för chatt"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "_Tillgänglig"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "Upprättar förbindelse"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "_Borta"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "Borta"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "_Frånkopplad"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "_Osynlig"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "Osynlig"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "?kontakt har status:Okänd"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "?kontakt har status:Har fel"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "?Prenumeration vi redan har:Ingen"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "Till"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "Från"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "Båda"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "?Fråga (för prenumeration):Ingen"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "uppmärksammar konversationen"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "gör något annat"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "skriver ett meddelande..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "tog en paus i skrivandet"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "har stängt chattfönstret eller fliken"
 
@@ -4858,10 +4874,113 @@ msgstr "har stängt chattfönstret eller fliken"
 msgid "error: cannot open %s for reading"
 msgstr "fel: kan inte öppna %s för läsning"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "enkel"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "cyan"
 
+#~ msgid "Send"
+#~ msgstr "Sänd"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr "%(nickname)s i rum %(room_name)s har skickat dig ett meddelande."
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s har skickat dig ett nytt meddelande."
+
+#~ msgid "GUI Migration failed"
+#~ msgstr "GUI Migration misslyckades"
+
+#~ msgid ""
+#~ "Logs migration through graphical interface failed. The migration process "
+#~ "will start in the background. Please wait a few minutes for Gajim to "
+#~ "start."
+#~ msgstr ""
+#~ "Migration av logfiler genom grafiskt gränssnitt misslyckades. "
+#~ "Migrationsprocessen kommer att startas i bakgrunden. Vänligen tillåt "
+#~ "några minuter för Gajim att starta."
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "Migrationen av logfiler till databasen lyckades."
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr "Om ikryssat kommer Gajim också att ha en aktivitetsfältsikon"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "Profil, avatar"
+
+#~ msgid "_Online Users"
+#~ msgstr "_Anslutna användare"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "Starta Chatt med konto %s"
+
+#~ 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"
+
+#~ msgid "Size: "
+#~ msgstr "Storlek: "
+
+#~ msgid "Session bus is not available"
+#~ msgstr "Sessionsbus inte tillgänglig"
+
+#~ msgid "Unable to load idle module"
+#~ msgstr "Lyckades inte ladda tomgångsmodul"
+
+#~ msgid "Unable to join room"
+#~ msgstr "Lyckades inte gå med i rummet"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "Det krävs en lösenfras för att ansluta till detta rum."
+
+#~ msgid "You are banned from this room."
+#~ msgstr "Du är bannlyst från detta rummet."
+
+#~ msgid "Such room does not exist."
+#~ msgstr "Det finns inget sådant rum."
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "Möjligheten att skapa rum är begränsad."
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "Ditt registrerade smeknamn måste användas."
+
+#~ msgid "You are not in the members list."
+#~ msgstr "Du är inte med i medlemslistan."
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "Ditt önskade smeknamn används redan eller är registrerat av en annan "
+#~ "deltagare.\n"
+#~ "Vänligen ange ett annat smeknamn nedan:"
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr "vi prenumererar nu på %s"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr "avprenumerationsförfrågan från %s"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "vi prenumererar inte längre på %s"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s följer inte RFC. Dt kommer inte att läggas till till ditt "
+#~ "register. Använd registerhanteringsverktyg så som http://jru.jabberstudio."
+#~ "org/  för att ta bort det"
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr ""
+#~ "Registreringsinformation för transport %s har inte kommit fram i tid"
+
 #~ msgid "Sound"
 #~ msgstr "Ljud"
 
@@ -5003,9 +5122,6 @@ msgstr "cyan"
 #~ msgid "with account "
 #~ msgstr "konto: "
 
-#~ msgid "New Message as %s"
-#~ msgstr "Nytt meddelande som %s"
-
 #~ msgid "Chat with"
 #~ msgstr "Chatta med"
 
diff --git a/po/zh_CN/LC_MESSAGES/gajim.po b/po/zh_CN/LC_MESSAGES/gajim.po
index 4e597be0b..c54180cd0 100644
--- a/po/zh_CN/LC_MESSAGES/gajim.po
+++ b/po/zh_CN/LC_MESSAGES/gajim.po
@@ -5,12 +5,12 @@
 # wwld <wwld@radio.lzusiyu.org>, 2005.
 # kangkang <kanger@gamil.com>, 2005.
 #
-#: ../src/gajim-remote.py:206 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 09:43+0100\n"
+"POT-Creation-Date: 2006-04-09 01:57+0300\n"
 "PO-Revision-Date: 2005-12-30 09:17+0800\n"
 "Last-Translator: kangkang <kanger@gmail.com>\n"
 "Language-Team: sIyU <jabber@lzusiyu.org>\n"
@@ -56,7 +56,7 @@ msgid "Hidden"
 msgstr "隐藏"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:136 ../src/dialogs.py:1120
+#: ../src/chat_control.py:157 ../src/dialogs.py:1180
 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 "
@@ -72,81 +72,78 @@ msgstr ""
 "拼写检查功能未启用"
 
 #. we are not connected
-#: ../src/chat_control.py:149 ../src/chat_control.py:322
+#: ../src/chat_control.py:170 ../src/chat_control.py:373
 msgid "A connection is not available"
 msgstr "连接不可用"
 
-#: ../src/chat_control.py:150 ../src/chat_control.py:323
+#: ../src/chat_control.py:171 ../src/chat_control.py:374
 msgid "Your message can not be sent until you are connected."
 msgstr "连接之后您的消息才能发送"
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:92
+#: ../src/chat_control.py:699 ../src/gtkgui.glade.h:92
 msgid "Chat"
 msgstr "聊天"
 
-#: ../src/chat_control.py:689
+#: ../src/chat_control.py:699
 #, fuzzy
 msgid "Chats"
 msgstr "聊天"
 
-#: ../src/chat_control.py:923 ../src/gtkgui.glade.h:219
+#: ../src/chat_control.py:907 ../src/gtkgui.glade.h:223
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP 加密"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:927
+#: ../src/chat_control.py:911
 #, fuzzy, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s 没有广播 OpenPGP 密钥或您未指定"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1032
 msgid "Encryption enabled"
 msgstr "启用加密"
 
-#: ../src/chat_control.py:1053
+#: ../src/chat_control.py:1037
 msgid "Encryption disabled"
 msgstr "禁用加密"
 
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat_control.py:1157 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:114 ../src/dialogs.py:372 ../src/dialogs.py:417
-#: ../src/dialogs.py:1051 ../src/gajim.py:637 ../src/gajim.py:638
-#: ../src/roster_window.py:1191 ../src/roster_window.py:1467
-#: ../src/roster_window.py:1654 ../src/roster_window.py:1925
-#: ../src/roster_window.py:1971 ../src/roster_window.py:2443
-#: ../src/roster_window.py:2723 ../src/roster_window.py:2725
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/common/helpers.py:223
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1159 ../src/conversation_textview.py:373
+#: ../src/dialogs.py:465 ../src/gajim.py:680 ../src/gajim.py:681
+#: ../src/roster_window.py:1267 ../src/roster_window.py:1588
+#: ../src/roster_window.py:1766 ../src/roster_window.py:2061
+#: ../src/roster_window.py:2107 ../src/roster_window.py:2873
+#: ../src/roster_window.py:2875 ../src/common/helpers.py:44
+#: ../src/common/helpers.py:227
 msgid "Not in Roster"
 msgstr "不在名单中"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1270
+#: ../src/chat_control.py:1274
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "收到一条来自 “%s” 的消息"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1275
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您关闭此标签并且禁用历史，此消息会丢失。"
 
-#: ../src/config.py:209
+#: ../src/config.py:208
 #, python-format
 msgid "Every %s _minutes"
 msgstr "每 %s 分钟(m)"
 
-#: ../src/config.py:332
+#: ../src/config.py:333 ../src/gtkgui.glade.h:42
 msgid "Active"
 msgstr "活动"
 
-#: ../src/config.py:340
+#: ../src/config.py:341
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:510
+#: ../src/config.py:511
 msgid "Disabled"
 msgstr ""
 
@@ -194,199 +191,212 @@ msgstr ""
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP 在本机不可用"
 
-#: ../src/config.py:1117
+#: ../src/config.py:1120
 msgid "You are currently connected to the server"
 msgstr "正在连接到服务器"
 
-#: ../src/config.py:1118
+#: ../src/config.py:1121
 msgid "To change the account name, you must be disconnected."
 msgstr "如要改变账户名称，需断开连接。"
 
-#: ../src/config.py:1121 ../src/config.py:1125
+#: ../src/config.py:1124 ../src/config.py:1652
+msgid "Unread events"
+msgstr ""
+
+#: ../src/config.py:1125
+#, fuzzy
+msgid "To change the account name, you must read all pending events."
+msgstr "如要改变账户名称，需断开连接。"
+
+#: ../src/config.py:1129 ../src/config.py:1133
 msgid "Invalid account name"
 msgstr "无效的账户名称"
 
-#: ../src/config.py:1122
+#: ../src/config.py:1130
 msgid "Account name cannot be empty."
 msgstr "账户名不能为空。"
 
-#: ../src/config.py:1126
+#: ../src/config.py:1134
 msgid "Account name cannot contain spaces."
 msgstr "账户名不能包含空格。"
 
-#: ../src/config.py:1134 ../src/config.py:1140 ../src/config.py:1149
-#: ../src/config.py:2538
+#: ../src/config.py:1142 ../src/config.py:1148 ../src/config.py:1157
+#: ../src/config.py:2562
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/config.py:1141
+#: ../src/config.py:1149
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式为 “用户@服务器名”。"
 
-#: ../src/config.py:1195
+#: ../src/config.py:1205
 msgid "Invalid entry"
 msgstr "无效输入"
 
-#: ../src/config.py:1196
+#: ../src/config.py:1206
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: ../src/config.py:1277
-msgid "Relogin now?"
-msgstr ""
-
-#: ../src/config.py:1278
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-
-#: ../src/config.py:1303
+#: ../src/config.py:1311
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1322
+#: ../src/config.py:1314
+msgid "Relogin now?"
+msgstr ""
+
+#: ../src/config.py:1315
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+
+#: ../src/config.py:1333
 msgid "No such account available"
 msgstr "没有有效账户"
 
-#: ../src/config.py:1323
+#: ../src/config.py:1334
 msgid "You must create your account before editing your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
 
-#: ../src/config.py:1330 ../src/dialogs.py:730 ../src/dialogs.py:877
-#: ../src/disco.py:420 ../src/vcard.py:476 ../src/vcard.py:505
+#: ../src/config.py:1341 ../src/dialogs.py:844 ../src/dialogs.py:990
+#: ../src/disco.py:419 ../src/vcard.py:475 ../src/vcard.py:504
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
-#: ../src/config.py:1331
+#: ../src/config.py:1342
 msgid "Without a connection, you can not edit your personal information."
 msgstr "无法脱机编辑个人信息。"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1372
 msgid "Failed to get secret keys"
 msgstr "获取密钥失败"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1373
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "在取回 OpenPGP 密钥时发生错误。"
 
-#: ../src/config.py:1366
+#: ../src/config.py:1376
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 加密"
 
-#: ../src/config.py:1367
+#: ../src/config.py:1377
 msgid "Choose your OpenPGP key"
 msgstr "选择您的 OpenPGP 钥匙"
 
-#: ../src/config.py:1375 ../src/gtkgui.glade.h:210
+#: ../src/config.py:1385 ../src/gtkgui.glade.h:215
 msgid "No key selected"
 msgstr "没有选择钥匙"
 
 #. Name column
-#: ../src/config.py:1594 ../src/disco.py:678 ../src/disco.py:1418
+#: ../src/config.py:1604 ../src/disco.py:736 ../src/disco.py:1475
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "名称"
 
-#: ../src/config.py:1597
+#: ../src/config.py:1607
 msgid "Server"
 msgstr "服务器"
 
-#: ../src/config.py:1834
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr ""
+
+#: ../src/config.py:1848
 #, python-format
 msgid "Edit %s"
 msgstr "编辑 %s"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1850
 #, python-format
 msgid "Register to %s"
 msgstr "注册到 %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1921
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:1908
+#: ../src/config.py:1922
 #, fuzzy
 msgid "Member List"
 msgstr "成员(_M)"
 
-#: ../src/config.py:1909
+#: ../src/config.py:1923
 #, fuzzy
 msgid "Owner List"
 msgstr "拥有人(_O)"
 
-#: ../src/config.py:1910
+#: ../src/config.py:1924
 #, fuzzy
 msgid "Administrator List"
 msgstr "管理员(_A)"
 
 #. Address column
-#: ../src/config.py:1943 ../src/disco.py:685
+#: ../src/config.py:1957 ../src/disco.py:743
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1965
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:1956
+#: ../src/config.py:1970
 #, fuzzy
 msgid "Nick"
 msgstr "踢除(_K)"
 
-#: ../src/config.py:1960
+#: ../src/config.py:1974
 #, fuzzy
 msgid "Role"
 msgstr "角色："
 
-#: ../src/config.py:1981
+#: ../src/config.py:1995
 #, fuzzy
 msgid "Banning..."
 msgstr "封禁 %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:1983
+#: ../src/config.py:1997
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>想做什么？</b>"
 
-#: ../src/config.py:1985
+#: ../src/config.py:1999
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:1986
+#: ../src/config.py:2000
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>想做什么？</b>"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2002
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:1989
+#: ../src/config.py:2003
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>想做什么？</b>"
 
-#: ../src/config.py:1991
+#: ../src/config.py:2005
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "管理员(_A)"
 
-#: ../src/config.py:1992
+#: ../src/config.py:2006
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>想做什么？</b>"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2007
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -396,75 +406,85 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2089
+#: ../src/config.py:2103
 #, python-format
 msgid "Removing %s account"
 msgstr "移除账户 %s"
 
-#: ../src/config.py:2096
-#, python-format
-msgid "Account \"%s\" is connected to the server"
-msgstr "账户 “%s” 已连接到服务器"
-
-#: ../src/config.py:2097
-msgid "If you remove it, the connection will be lost."
-msgstr "如果移除，将会丢失连接"
-
-#: ../src/config.py:2108 ../src/roster_window.py:1683
+#: ../src/config.py:2120 ../src/roster_window.py:1806
 msgid "Password Required"
 msgstr "需要密码"
 
-#: ../src/config.py:2109 ../src/roster_window.py:1684
+#: ../src/config.py:2121 ../src/roster_window.py:1807
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: ../src/config.py:2110 ../src/roster_window.py:1685
+#: ../src/config.py:2122 ../src/roster_window.py:1808
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2135
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "账户 “%s” 已连接到服务器"
+
+#: ../src/config.py:2136
+msgid "If you remove it, the connection will be lost."
+msgstr "如果移除，将会丢失连接"
+
+#: ../src/config.py:2269
 msgid "New Room"
 msgstr "新房间"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2300
 msgid "This bookmark has invalid data"
 msgstr "此书签含无效数据"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2301
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "请确认填写服务器与房间字段或移除此书签。"
 
-#: ../src/config.py:2514
+#: ../src/config.py:2538
 msgid "Invalid username"
 msgstr "无效用户名"
 
-#: ../src/config.py:2515
+#: ../src/config.py:2539
 msgid "You must provide a username to configure this account."
 msgstr "必须提供用户名来配置此账户。"
 
-#: ../src/config.py:2524 ../src/dialogs.py:896
+#: ../src/config.py:2548 ../src/dialogs.py:1009
 msgid "Invalid password"
 msgstr "无效密码"
 
-#: ../src/config.py:2525
+#: ../src/config.py:2549
 msgid "You must enter a password for the new account."
 msgstr "必须为新账户输入密码。"
 
-#: ../src/config.py:2529 ../src/dialogs.py:901
+#: ../src/config.py:2553 ../src/dialogs.py:1014
 msgid "Passwords do not match"
 msgstr "密码不符"
 
-#: ../src/config.py:2530 ../src/dialogs.py:902
+#: ../src/config.py:2554 ../src/dialogs.py:1015
 msgid "The passwords typed in both fields must be identical."
 msgstr "两次密码输入不一致。"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2573
+#, fuzzy
+msgid "Duplicate Jabber ID"
+msgstr "无效的 Jabber ID"
+
+#: ../src/config.py:2574
+#, fuzzy
+msgid "This account is already configured in Gajim."
+msgstr "此联系人已在名单中。"
+
+#: ../src/config.py:2591
 msgid "Account has been added successfully"
 msgstr "成功添加账户"
 
-#: ../src/config.py:2556 ../src/config.py:2587
+#: ../src/config.py:2592 ../src/config.py:2625
 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."
@@ -472,19 +492,19 @@ msgstr ""
 "您可以通过点击高级按钮进行高级设置，或稍后点击主窗口中编辑菜单下的账户菜单"
 "项。"
 
-#: ../src/config.py:2586
+#: ../src/config.py:2624
 msgid "Your new account has been created successfully"
 msgstr "注册新账户成功"
 
-#: ../src/config.py:2601
+#: ../src/config.py:2640
 msgid "An error occured during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2697
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
 
-#: ../src/config.py:2659
+#: ../src/config.py:2698
 msgid "You already have an account using this name."
 msgstr "有同名账户。"
 
@@ -541,163 +561,162 @@ msgid "Subject: %s\n"
 msgstr "主题：%s\n"
 
 #. only say that to non Windows users
-#: ../src/dbus_support.py:41
+#: ../src/dbus_support.py:34
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "本机缺少 D-Bus python 绑定"
 
-#: ../src/dbus_support.py:42
+#: ../src/dbus_support.py:35
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim 的 D-Bus 兼容性无法使用"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "联系人名称：<i>%s</i>"
 
-#: ../src/dialogs.py:63
+#: ../src/dialogs.py:66
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID： <i>%s</i>"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:114 ../src/dialogs.py:333 ../src/dialogs.py:372
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1201
-#: ../src/roster_window.py:188 ../src/roster_window.py:232
-#: ../src/roster_window.py:269 ../src/roster_window.py:287
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2721
-#: ../src/roster_window.py:2899 ../src/roster_window.py:2907
-#: ../src/roster_window.py:2922 ../src/systray.py:237
-msgid "Transports"
-msgstr "代理"
-
-#: ../src/dialogs.py:122
+#: ../src/dialogs.py:169
 msgid "Group"
 msgstr "群组"
 
-#: ../src/dialogs.py:129
+#: ../src/dialogs.py:176
 msgid "In the group"
 msgstr "群组内"
 
-#: ../src/dialogs.py:179
+#: ../src/dialogs.py:226
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:182
+#: ../src/dialogs.py:229
 msgid "Contact name"
 msgstr "联系人名"
 
-#: ../src/dialogs.py:216
+#: ../src/dialogs.py:263
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 状态消息"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:265
 msgid "Status Message"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:340
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>预设状态消息</b>"
 
-#: ../src/dialogs.py:294
+#: ../src/dialogs.py:341
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "输入新的消息："
 
-#: ../src/dialogs.py:322
+#: ../src/dialogs.py:369
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "请为账户 %s 填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:324
+#: ../src/dialogs.py:371
 msgid "Please fill in the data of the contact you want to add"
 msgstr "请填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:405 ../src/dialogs.py:411
+#. the user can be in mutiple groups, see in all of them
+#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
+#: ../src/disco.py:1258 ../src/roster_window.py:188
+#: ../src/roster_window.py:249 ../src/roster_window.py:284
+#: ../src/roster_window.py:304 ../src/roster_window.py:328
+#: ../src/roster_window.py:2869 ../src/roster_window.py:2871
+#: ../src/systray.py:265 ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "代理"
+
+#: ../src/dialogs.py:452 ../src/dialogs.py:458
 msgid "Invalid User ID"
 msgstr "无效的用户 ID"
 
-#: ../src/dialogs.py:412
+#: ../src/dialogs.py:459
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:466
 msgid "Contact already in roster"
 msgstr "联系人已经在名单中"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:467
 msgid "This contact is already listed in your roster."
 msgstr "此联系人已在名单中。"
 
-#: ../src/dialogs.py:481
+#: ../src/dialogs.py:528
 msgid "A GTK+ jabber client"
 msgstr "一个 GTK+ 的 Jabber 客户端"
 
-#: ../src/dialogs.py:491
+#: ../src/dialogs.py:538
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:494
+#: ../src/dialogs.py:541
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english setence
 #. and add it manually as translatable
-#: ../src/dialogs.py:501
+#: ../src/dialogs.py:548
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:515
+#: ../src/dialogs.py:562
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
 "kangkang <kanger@gmail.com>"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:799
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "该认证要求来自帐户 %s 由 %s 发送"
 
-#: ../src/dialogs.py:688
+#: ../src/dialogs.py:802
 #, python-format
 msgid "Subscription request from %s"
 msgstr "来自 %s 的认证请求"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:845
 msgid "You can not join a group chat unless you are connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:858
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:746 ../src/gtkgui.glade.h:191
+#: ../src/dialogs.py:860 ../src/gtkgui.glade.h:191
 msgid "Join Group Chat"
 msgstr "加入群聊"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:949
 #, fuzzy
 msgid "Invalid room or server name"
 msgstr "无效用户名"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:950
 msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:969
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:857
+#: ../src/dialogs.py:971
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: ../src/dialogs.py:858
+#: ../src/dialogs.py:972
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -706,157 +725,164 @@ msgstr ""
 "联系人 ID："
 
 #. if offline or connecting
-#: ../src/dialogs.py:866 ../src/dialogs.py:1243 ../src/dialogs.py:1363
+#: ../src/dialogs.py:980 ../src/dialogs.py:1303 ../src/dialogs.py:1423
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: ../src/dialogs.py:867 ../src/dialogs.py:1244 ../src/dialogs.py:1364
+#: ../src/dialogs.py:981 ../src/dialogs.py:1304 ../src/dialogs.py:1424
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "请确认已连接到 “%s”。"
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:991
 msgid "Without a connection, you can not change your password."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:1010
 msgid "You must enter a password."
 msgstr "此处必须输入密码"
 
 #. img to display
-#. default value of text
-#: ../src/dialogs.py:940 ../src/gajim.py:422 ../src/notify.py:140
+#. default value
+#: ../src/dialogs.py:1056 ../src/gajim.py:441 ../src/notify.py:129
 msgid "Contact Signed In"
 msgstr "联系人登录"
 
-#: ../src/dialogs.py:946 ../src/gajim.py:455 ../src/notify.py:143
+#: ../src/dialogs.py:1058 ../src/gajim.py:472 ../src/notify.py:131
 msgid "Contact Signed Out"
 msgstr "联系人退出登录"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:564 ../src/notify.py:145
+#. chat message
+#: ../src/dialogs.py:1060 ../src/gajim.py:607 ../src/notify.py:133
 msgid "New Message"
 msgstr "新消息"
 
-#: ../src/dialogs.py:952 ../src/gajim.py:558 ../src/notify.py:145
+#. single message
+#: ../src/dialogs.py:1060 ../src/gajim.py:601 ../src/notify.py:133
 msgid "New Single Message"
 msgstr "新消息"
 
-#: ../src/dialogs.py:953 ../src/gajim.py:503 ../src/notify.py:146
+#: ../src/dialogs.py:1061 ../src/gajim.py:584 ../src/notify.py:134
 msgid "New Private Message"
 msgstr "新的个人消息"
 
-#: ../src/dialogs.py:959 ../src/gajim.py:1103 ../src/notify.py:148
-msgid "File Transfer Request"
-msgstr "文件传输请求"
-
-#: ../src/dialogs.py:965 ../src/gajim.py:965 ../src/gajim.py:1081
-#: ../src/notify.py:150
-msgid "File Transfer Error"
-msgstr "文件传输错误"
-
-#: ../src/dialogs.py:971 ../src/gajim.py:1136 ../src/gajim.py:1158
-#: ../src/gajim.py:1175 ../src/notify.py:152
-msgid "File Transfer Completed"
-msgstr "文件传输完成"
-
-#: ../src/dialogs.py:972 ../src/gajim.py:1139 ../src/notify.py:152
-msgid "File Transfer Stopped"
-msgstr "文件传输已停止"
-
-#: ../src/dialogs.py:978 ../src/gajim.py:977 ../src/notify.py:154
+#: ../src/dialogs.py:1061 ../src/gajim.py:1047 ../src/notify.py:142
 msgid "New E-mail"
 msgstr ""
 
+#: ../src/dialogs.py:1063 ../src/gajim.py:1185 ../src/notify.py:136
+msgid "File Transfer Request"
+msgstr "文件传输请求"
+
+#: ../src/dialogs.py:1065 ../src/gajim.py:1033 ../src/gajim.py:1162
+#: ../src/notify.py:138
+msgid "File Transfer Error"
+msgstr "文件传输错误"
+
+#: ../src/dialogs.py:1067 ../src/gajim.py:1220 ../src/gajim.py:1242
+#: ../src/gajim.py:1259 ../src/notify.py:140
+msgid "File Transfer Completed"
+msgstr "文件传输完成"
+
+#: ../src/dialogs.py:1068 ../src/gajim.py:1223 ../src/notify.py:140
+msgid "File Transfer Stopped"
+msgstr "文件传输已停止"
+
+#: ../src/dialogs.py:1070 ../src/gajim.py:951 ../src/notify.py:144
+#, fuzzy
+msgid "Groupchat Invitation"
+msgstr "?Group Chat Contact Role: 无"
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1175
+#: ../src/dialogs.py:1235
 #, python-format
 msgid "Single Message with account %s"
 msgstr "账户 %s 的消息"
 
-#: ../src/dialogs.py:1177
+#: ../src/dialogs.py:1237
 msgid "Single Message"
 msgstr "单条消息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1180
+#: ../src/dialogs.py:1240
 #, python-format
 msgid "Send %s"
 msgstr "发送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1263
 #, 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:1269
+#: ../src/dialogs.py:1328
 #, python-format
 msgid "RE: %s"
 msgstr "回复： %s"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1329
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 写道：\n"
 
-#: ../src/dialogs.py:1314
+#: ../src/dialogs.py:1373
 #, python-format
 msgid "XML Console for %s"
 msgstr "账户 %s 的 XML 控制台"
 
-#: ../src/dialogs.py:1316
+#: ../src/dialogs.py:1375
 msgid "XML Console"
 msgstr " XML 控制台"
 
 #. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1400
+#: ../src/dialogs.py:1461
 #, fuzzy, python-format
 msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr "邀请 %(contact_jid)s 到 %(room_jid)s。"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:1406
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "Comment: %s"
 msgstr "注释： %s"
 
-#: ../src/dialogs.py:1474
+#: ../src/dialogs.py:1517
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: ../src/dialogs.py:1486 ../src/vcard.py:196
+#: ../src/dialogs.py:1529 ../src/vcard.py:190
 msgid "All files"
 msgstr "全部文件"
 
-#: ../src/dialogs.py:1491
+#: ../src/dialogs.py:1534
 msgid "Wav Sounds"
 msgstr "Wav声音"
 
-#: ../src/dialogs.py:1532
+#: ../src/dialogs.py:1575
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1535
+#: ../src/dialogs.py:1578
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:117
 msgid "Others"
 msgstr "其他"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:121
 msgid "Conference"
 msgstr "会议"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:420
 msgid "Without a connection, you can not browse available services"
 msgstr "连接后才可浏览可用服务"
 
-#: ../src/disco.py:498
+#: ../src/disco.py:499
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "搜索服务"
@@ -865,185 +891,186 @@ msgstr "搜索服务"
 msgid "Service Discovery"
 msgstr "搜索服务"
 
-#: ../src/disco.py:578
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "找不到该服务"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr "此地址没有服务或无应答。请检查地址后重试。"
 
-#: ../src/disco.py:583 ../src/disco.py:867
+#: ../src/disco.py:642 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "该服务无法浏览"
 
-#: ../src/disco.py:584
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "此服务没有项目可浏览。"
 
-#: ../src/disco.py:664
+#: ../src/disco.py:723
 #, fuzzy, python-format
 msgid "Browsing %s using account %s"
 msgstr "使用账户 %s"
 
-#: ../src/disco.py:704
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: ../src/disco.py:1089 ../src/disco.py:1206
+#: ../src/disco.py:1146 ../src/disco.py:1263
 msgid "Re_gister"
 msgstr "注册(_G)"
 
-#: ../src/disco.py:1097 ../src/disco.py:1459 ../src/gtkgui.glade.h:364
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:369
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/disco.py:1204 ../src/gtkgui.glade.h:350 ../src/roster_window.py:1291
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:353 ../src/roster_window.py:1392
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../src/disco.py:1243
+#: ../src/disco.py:1300
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "已扫描 %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1425
+#: ../src/disco.py:1482
 msgid "Users"
 msgstr "用户"
 
 #. Description column
-#: ../src/disco.py:1432
+#: ../src/disco.py:1489
 msgid "Description"
 msgstr "描述"
 
-#: ../src/filetransfers_window.py:83
+#: ../src/filetransfers_window.py:81
 msgid "File"
 msgstr "文件"
 
-#: ../src/filetransfers_window.py:98
+#: ../src/filetransfers_window.py:96
 msgid "Time"
 msgstr "时间"
 
-#: ../src/filetransfers_window.py:110
+#: ../src/filetransfers_window.py:108
 msgid "Progress"
 msgstr "进程"
 
-#: ../src/filetransfers_window.py:168 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
 #, python-format
 msgid "Filename: %s"
 msgstr "文件名： %s"
 
-#: ../src/filetransfers_window.py:170 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:324
 #, python-format
 msgid "Size: %s"
 msgstr "大小： %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/history_manager.py:419
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:415
 msgid "You"
 msgstr "您"
 
-#: ../src/filetransfers_window.py:180 ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Sender: %s"
 msgstr "发送者： %s"
 
-#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:574
-#: ../src/tooltips.py:586
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:574
+#: ../src/tooltips.py:617
 msgid "Recipient: "
 msgstr "接收者： %s"
 
-#: ../src/filetransfers_window.py:192
+#: ../src/filetransfers_window.py:200
 #, python-format
 msgid "Saved in: %s"
 msgstr "保存在： %s"
 
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "文件传输已完成"
 
-#: ../src/filetransfers_window.py:197 ../src/gtkgui.glade.h:382
+#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:386
 msgid "_Open Containing Folder"
 msgstr "打开文件夹(_O)"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
 msgid "File transfer canceled"
 msgstr "文件传输已取消"
 
-#: ../src/filetransfers_window.py:215 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
 msgid "Connection with peer cannot be established."
 msgstr "无法与对方建立连接。"
 
-#: ../src/filetransfers_window.py:238
+#: ../src/filetransfers_window.py:242
 msgid "File transfer stopped by the contact of the other side"
 msgstr "文件传输被对方中止"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:247
 msgid "Choose File to Send..."
 msgstr "选择要发送的文件..."
 
-#: ../src/filetransfers_window.py:247
-msgid "Send"
-msgstr "发送"
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../src/filetransfers_window.py:254 ../src/gtkgui.glade.h:410
+msgid "_Send"
+msgstr "发送(_S)"
 
-#: ../src/filetransfers_window.py:277
+#: ../src/filetransfers_window.py:279
 msgid "Gajim cannot access this file"
 msgstr "Gajim 无法访问此文件"
 
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:280
 msgid "This file is being used by another process."
 msgstr "此文件正在被其它程序使用。"
 
-#: ../src/filetransfers_window.py:306 ../src/filetransfers_window.py:355
+#: ../src/filetransfers_window.py:308 ../src/filetransfers_window.py:357
 msgid "This file already exists"
 msgstr "文件已经存在"
 
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:308
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>想做什么？</b>"
 
-#: ../src/filetransfers_window.py:321
+#: ../src/filetransfers_window.py:322
 #, python-format
 msgid "File: %s"
 msgstr "文件： %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:327
 #, python-format
 msgid "Type: %s"
 msgstr "类型：%s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:329
 #, python-format
 msgid "Description: %s"
 msgstr "描述： %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s 想发送给您一个文件："
 
-#: ../src/filetransfers_window.py:332
+#: ../src/filetransfers_window.py:333
 msgid "Save File as..."
 msgstr "另存为..."
 
-#: ../src/filetransfers_window.py:356
+#: ../src/filetransfers_window.py:358
 msgid "Would you like to overwrite it?"
 msgstr "确认覆盖该文件？"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:428
+#: ../src/filetransfers_window.py:437
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -1051,7 +1078,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:500
+#: ../src/filetransfers_window.py:509
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
@@ -1068,12 +1095,12 @@ msgstr "文件："
 msgid "It is not possible to send empty files"
 msgstr "无法发送空文件"
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:480
-#: ../src/tooltips.py:570
+#: ../src/filetransfers_window.py:570 ../src/tooltips.py:498
+#: ../src/tooltips.py:607
 msgid "Name: "
 msgstr "名称："
 
-#: ../src/filetransfers_window.py:572 ../src/tooltips.py:580
+#: ../src/filetransfers_window.py:572 ../src/tooltips.py:611
 msgid "Sender: "
 msgstr "发送者："
 
@@ -1081,92 +1108,92 @@ msgstr "发送者："
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:344
+#: ../src/filetransfers_window.py:772 ../src/gtkgui.glade.h:347
 msgid "_Continue"
 msgstr "继续(_C)"
 
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:84
 msgid "shows a help on specific command"
 msgstr "为特定命令显示帮助"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:87
 msgid "command"
 msgstr "命令"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:88
 msgid "show help on command"
 msgstr "为命令显示帮助"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:92
 msgid "Shows or hides the roster window"
 msgstr "显示/隐藏名单窗口"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:96
 msgid "Popups a window with the next unread message"
 msgstr "为下一条未读消息弹出窗口"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:100
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr "打印名单中所有联系人。每个联系人一行。"
 
-#: ../src/gajim-remote.py:104 ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:140
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:199 ../src/gajim-remote.py:206
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:211
 msgid "account"
 msgstr "账户"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:102
 msgid "show only contacts of the given account"
 msgstr "只显示指定帐户的联系人"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:107
 msgid "Prints a list of registered accounts"
 msgstr "打印注册的账户"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:111
 msgid "Changes the status of account or accounts"
 msgstr "改变一个或多个账户状态"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "status"
 msgstr "状态"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:113
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "下列中的一项： 离线，在线，聊天，离开，不可用, dnd, 隐身"
 
-#: ../src/gajim-remote.py:116 ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
 msgid "message"
 msgstr "消息"
 
-#: ../src/gajim-remote.py:116
+#: ../src/gajim-remote.py:114
 msgid "status message"
 msgstr "状态消息"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:115
 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 "改变账户的状态。如果不指明，将改变设置“与全局同步”选项的账户"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:121
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "显示对话框用于给联系人发送消息"
 
-#: ../src/gajim-remote.py:125
+#: ../src/gajim-remote.py:123
 msgid "JID of the contact that you want to chat with"
 msgstr "您想聊天的 JID"
 
-#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定，将从此帐户列表下移出联系人"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends 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 "
@@ -1175,125 +1202,125 @@ msgstr ""
 "发送新消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而不需"
 "要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:134
 msgid "JID of the contact that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: ../src/gajim-remote.py:137
+#: ../src/gajim-remote.py:135
 msgid "message contents"
 msgstr "消息内容"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "pgp key"
 msgstr "PGP 钥匙"
 
-#: ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:136
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定，该消息将使用本公共密钥加密"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:138
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定，消息将被用此账户发送"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:143
 msgid "Gets detailed info on a contact"
 msgstr "获得联系人的详细信息"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188
 msgid "JID of the contact"
 msgstr "联系人的 JID "
 
-#: ../src/gajim-remote.py:151
+#: ../src/gajim-remote.py:149
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "获得联系人的详细信息"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:151
 #, fuzzy
 msgid "Name of the account"
 msgstr "没有活动的账户"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:155
 msgid "Sends file to a contact"
 msgstr "向联系人发送文件"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "file"
 msgstr "文件"
 
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:157
 msgid "File path"
 msgstr "文件路径"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:159
 msgid "if specified, file will be sent using this account"
 msgstr "如指定，文件将被用此账户发送"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:164
 msgid "Lists all preferences and their values"
 msgstr "列出所有的参数及它们的值"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:168
 msgid "Sets value of 'key' to 'value'."
 msgstr "将“密钥”的值设为“值”"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "key=value"
 msgstr "键=值"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:170
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "“密钥”是参数名，而“值”是赋予参数的数值"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:175
 msgid "Deletes a preference item"
 msgstr "删除一个参数项"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "key"
 msgstr "键"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:177
 msgid "name of the preference to be deleted"
 msgstr "需要删除的参数名"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:181
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "将当前Gajim的国家设置写入 .config 文件"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:186
 msgid "Removes contact from roster"
 msgstr "从名单移除联系人"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:195
 msgid "Adds contact to roster"
 msgstr "向名单添加联系人"
 
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:197
 msgid "Adds new contact to this account."
 msgstr "为此账户加入新联系人。"
 
-#: ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:202
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "返回当前状态(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:209
 #, fuzzy
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr "返回当前状态(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:216
 #, fuzzy
 msgid "Returns number of unreaded messages"
 msgstr "您有未读消息"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:236
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的“联系人 JID”参数"
 
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:255
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1302,16 +1329,16 @@ msgstr ""
 "\"%s\" 不是您的名单中。\n"
 "请为发送此消息指定账户。"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:258
 msgid "You have no active account"
 msgstr "没有活动的账户"
 
-#: ../src/gajim-remote.py:298
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "未知的 D-Bus 版本： %s"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, fuzzy, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1320,16 +1347,16 @@ msgstr ""
 "用法： %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "Arguments:"
 msgstr "参数："
 
-#: ../src/gajim-remote.py:332
+#: ../src/gajim-remote.py:335
 #, python-format
 msgid "%s not found"
 msgstr " %s 未找到"
 
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:339
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1338,7 +1365,7 @@ msgstr ""
 "用法：%s 命令 [参数] \n"
 "命令是下列之一：\n"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:413
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1347,163 +1374,182 @@ msgstr ""
 "参数“%s”未指定。\n"
 "输入“%s help %s”以获取更多信息"
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:48
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "运行 Gajim 需要 X 服务器。退出..."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:52
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim 需要 PyGTK 2.6 或更高版本"
 
-#: ../src/gajim.py:54
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "运行 Gajim 需要 PyGTK 2.6 或更高版本。退出..."
 
-#: ../src/gajim.py:56
+#: ../src/gajim.py:55
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim 需要 GTK 2.6 或更高版本"
 
-#: ../src/gajim.py:57
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "运行 Gajim 需要 GTK 2.6 或更高版本。退出..."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:61
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ 运行时环境缺少 libglade 支持"
 
-#: ../src/gajim.py:64
+#: ../src/gajim.py:63
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 msgstr "请移除当前的 GTK+ 运行时环境并从 %s 安装最新稳定版本"
 
-#: ../src/gajim.py:66
+#: ../src/gajim.py:65
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "请确定您系统中的的 gtk 及 pygtk 支持 libglade。"
 
-#: ../src/gajim.py:71
+#: ../src/gajim.py:70
 msgid "Gajim needs PySQLite2 to run"
 msgstr "运行 Gajim 需要 PySQLite2 "
 
-#. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:223
+#: ../src/gajim.py:235
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) 授权给 %s (id: %s)"
 
-#: ../src/gajim.py:224
+#: ../src/gajim.py:236
 msgid "Do you accept this request?"
 msgstr "是否接受这个请求？"
 
-#: ../src/gajim.py:498
-#, python-format
-msgid "%(nickname)s in room %(room_name)s has sent you a new message."
-msgstr "房间 %(room_name)s 的 %(nickname)s 向您发送了一条新消息。"
+#: ../src/gajim.py:436
+#, fuzzy, python-format
+msgid "%(nickname)s Signed In"
+msgstr "联系人登录"
 
-#: ../src/gajim.py:553
-#, python-format
-msgid "%s has sent you a new message."
-msgstr "%s 给您发送了一条新消息。"
+#: ../src/gajim.py:467
+#, fuzzy, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "联系人退出登录"
 
-#: ../src/gajim.py:613
+#: ../src/gajim.py:581
+#, fuzzy, python-format
+msgid "New Private Message from room %s"
+msgstr "新的个人消息"
+
+#: ../src/gajim.py:582
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/gajim.py:604
+#, fuzzy, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "新消息"
+
+#: ../src/gajim.py:610
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr ""
+
+#: ../src/gajim.py:656
 msgid "error while sending"
 msgstr "发送时出现错误"
 
-#: ../src/gajim.py:653
+#: ../src/gajim.py:696
 msgid "Authorization accepted"
 msgstr "授权被接受"
 
-#: ../src/gajim.py:654
+#: ../src/gajim.py:697
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "联系人“%s”已授权您查看他/她的状态。"
 
-#: ../src/gajim.py:661
+#: ../src/gajim.py:705
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "联系人“%s”移除了来自您的认证"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:706
 msgid "You will always see him or her as offline."
 msgstr "您将一直看到他/她的状态为离线。"
 
-#: ../src/gajim.py:688
+#: ../src/gajim.py:732
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "无法与对方“ %s ”建立连接。"
 
-#: ../src/gajim.py:689 ../src/common/connection.py:1853
+#: ../src/gajim.py:733 ../src/common/connection.py:343
 msgid "Check your connection or try again later."
 msgstr "检查连接并稍后重试。"
 
-#: ../src/gajim.py:828 ../src/roster_window.py:887
+#: ../src/gajim.py:872 ../src/roster_window.py:947
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s 正在 %s (%s)."
 
-#: ../src/gajim.py:901
+#: ../src/gajim.py:961
 msgid "Your passphrase is incorrect"
 msgstr "您的密文不正确"
 
-#: ../src/gajim.py:902
+#: ../src/gajim.py:962
 msgid "You are currently connected without your OpenPGP key."
 msgstr "已建立没有 OpenPGP 密钥的连接"
 
 #. FIXME: find a better image
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1043
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
+msgstr ""
+
+#: ../src/gajim.py:1045
 #, fuzzy, python-format
 msgid "You have %d new E-mail message"
 msgid_plural "You have %d new E-mail messages"
 msgstr[0] "您有未读消息"
 
-#: ../src/gajim.py:975
-#, python-format
-msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
-msgstr ""
-
-#: ../src/gajim.py:1101
+#: ../src/gajim.py:1183
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想发送给您一个文件。"
 
-#: ../src/gajim.py:1159
+#: ../src/gajim.py:1243
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "你成功的从 %(name)s 收到文件  %(filename)s。"
 
 #. ft stopped
-#: ../src/gajim.py:1163
+#: ../src/gajim.py:1247
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: ../src/gajim.py:1176
+#: ../src/gajim.py:1260
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
 
 #. ft stopped
-#: ../src/gajim.py:1180
+#: ../src/gajim.py:1264
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "vCard publication succeeded"
 msgstr " vCard 发布成功"
 
-#: ../src/gajim.py:1208
+#: ../src/gajim.py:1293
 msgid "Your personal information has been published successfully."
 msgstr "您的个人信息被成功发布。"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid "vCard publication failed"
 msgstr "vCard 发布失败"
 
-#: ../src/gajim.py:1211
+#: ../src/gajim.py:1296
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1511,159 +1557,143 @@ msgstr "发布您的个人信息时发生错误，请稍后重试。"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1508
+#: ../src/gajim.py:1626
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
-#: ../src/gajim.py:1719
-#, fuzzy
-msgid "GUI Migration failed"
-msgstr "vCard 发布失败"
-
-#: ../src/gajim.py:1722
-msgid ""
-"Logs migration through graphical interface failed. The migration process "
-"will start in the background. Please wait a few minutes for Gajim to start."
-msgstr ""
-
-#. loop for ever
-#: ../src/gajim.py:1730
-msgid "Logs have been successfully migrated to the database."
-msgstr "日志被成功移动到数据库。"
-
-#: ../src/gajim.py:1743
+#: ../src/gajim.py:1840
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "会话管理器支持不可用(丢失 gnome.ui 模块)"
 
-#: ../src/gajim.py:1774
+#: ../src/gajim.py:1870
 msgid "Migrating Logs..."
 msgstr "正在移动日志..."
 
-#: ../src/gajim.py:1775
+#: ../src/gajim.py:1871
 msgid "Please wait while logs are being migrated..."
 msgstr "请等待日志被移动..."
 
-#: ../src/gajim_themes_window.py:63
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "主题"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:146
+#: ../src/gajim_themes_window.py:149
 msgid "theme name"
 msgstr "主题名称"
 
-#: ../src/gajim_themes_window.py:164
+#: ../src/gajim_themes_window.py:166
 msgid "You cannot delete your current theme"
 msgstr "无法删除当前主题"
 
-#: ../src/gajim_themes_window.py:165
+#: ../src/gajim_themes_window.py:167
 msgid "Please first choose another for your current theme."
 msgstr "请先选择其他主题作为当前主题"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chat"
 msgstr "开始聊天"
 
-#: ../src/groupchat_control.py:73
+#: ../src/groupchat_control.py:68
 #, fuzzy
 msgid "Private Chats"
 msgstr "开始聊天"
 
-#: ../src/groupchat_control.py:89
+#: ../src/groupchat_control.py:84
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:91
+#: ../src/groupchat_control.py:86
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "您不再在房间“%s”中或“%s”已离开。"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 msgid "Group Chat"
 msgstr "群聊"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:98
 #, fuzzy
 msgid "Group Chats"
 msgstr "群聊"
 
-#: ../src/groupchat_control.py:570
+#: ../src/groupchat_control.py:565
 msgid "This room has no subject"
 msgstr "该房间无话题"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:668
+#: ../src/groupchat_control.py:663
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:672
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 踢出：%(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:679
+#: ../src/groupchat_control.py:674
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:683
+#: ../src/groupchat_control.py:678
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:691
+#: ../src/groupchat_control.py:686
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: ../src/groupchat_control.py:693
+#: ../src/groupchat_control.py:688
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s 现在成了 %s"
 
-#: ../src/groupchat_control.py:732
+#: ../src/groupchat_control.py:727
 #, python-format
 msgid "%s has left"
 msgstr " %s 离开了"
 
 #. No status message
-#: ../src/groupchat_control.py:734 ../src/roster_window.py:890
+#: ../src/groupchat_control.py:729 ../src/roster_window.py:950
 #, python-format
 msgid "%s is now %s"
 msgstr "%s 正在 %s"
 
-#: ../src/groupchat_control.py:846 ../src/groupchat_control.py:863
-#: ../src/groupchat_control.py:956 ../src/groupchat_control.py:972
+#: ../src/groupchat_control.py:841 ../src/groupchat_control.py:858
+#: ../src/groupchat_control.py:951 ../src/groupchat_control.py:967
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "昵称未找到： %s "
 
-#: ../src/groupchat_control.py:890
+#: ../src/groupchat_control.py:885
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "邀请 %(contact_jid)s 到 %(room_jid)s。"
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:897 ../src/groupchat_control.py:927
+#: ../src/groupchat_control.py:892 ../src/groupchat_control.py:922
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr " %s 可能不是有效的 JID "
 
-#: ../src/groupchat_control.py:994
+#: ../src/groupchat_control.py:989
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "没有此命令：/%s (如果想送出此前缀请用 /say)"
 
-#: ../src/groupchat_control.py:1016
+#: ../src/groupchat_control.py:1011
 #, python-format
 msgid "Commands: %s"
 msgstr "命令： %s "
 
-#: ../src/groupchat_control.py:1018
+#: ../src/groupchat_control.py:1013
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1674,44 +1704,44 @@ msgstr ""
 "用法：/%s <昵称|JID> [原因]，从此房间封禁 JID。昵称可能被代替，除了包含“@”。"
 "如果 JID 在房间里，他/她/它将被踢出。注意：不支持包含空格的昵称。"
 
-#: ../src/groupchat_control.py:1024
+#: ../src/groupchat_control.py:1019
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr "用法：/%s <昵称>, 为指定房主打开一个私聊窗口"
 
-#: ../src/groupchat_control.py:1028
+#: ../src/groupchat_control.py:1023
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "用法：/%s，清除文本窗口。"
 
-#: ../src/groupchat_control.py:1030
+#: ../src/groupchat_control.py:1025
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr "用法：/%s [原因]，关闭当前窗口或标签，如果指定将显示原因。"
 
-#: ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1028
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "用法：/%s，设置群聊窗口为紧凑模式。"
 
-#: ../src/groupchat_control.py:1036
+#: ../src/groupchat_control.py:1031
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
 "providing a reason."
 msgstr "用法：/%s <JID> [原因]，邀请 JID 到当前房间，可以提供一个原因。"
 
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1035
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 msgstr "用法: /%s <房间>@<服务器>[/昵称], 申请以指定昵称加入“房间@服务器”。"
 
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1039
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1721,7 +1751,7 @@ msgstr ""
 "用法：/%s <昵称> [原因]，通过昵称移除房主，原因可选。注意：不支持含空格的昵"
 "称。"
 
-#: ../src/groupchat_control.py:1049
+#: ../src/groupchat_control.py:1044
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1729,93 +1759,93 @@ msgid ""
 msgstr ""
 "用法：/%s <动作>，发送动作到当前房间。使用第三人称。(例如：/%s exploeds)"
 
-#: ../src/groupchat_control.py:1053
+#: ../src/groupchat_control.py:1048
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
 "message to the occupant specified by nickname."
 msgstr "用法： /%s <昵称> [消息], 向以昵称指定的房主发送消息并打开私聊窗口。 "
 
-#: ../src/groupchat_control.py:1058
+#: ../src/groupchat_control.py:1053
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "用法：/%s <昵称>，改变昵称。"
 
-#: ../src/groupchat_control.py:1062
+#: ../src/groupchat_control.py:1057
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "用法：/%s [主题]，显示或更新房间的主题。"
 
-#: ../src/groupchat_control.py:1065
+#: ../src/groupchat_control.py:1060
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "用法：/%s <消息>，不使用其他命令发送消息。"
 
-#: ../src/groupchat_control.py:1068
+#: ../src/groupchat_control.py:1063
 #, python-format
 msgid "No help info for /%s"
 msgstr "没有 /%s 的帮助信息"
 
-#: ../src/groupchat_control.py:1104
+#: ../src/groupchat_control.py:1099
 #, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgstr "确定要离开房间“ %s ”？"
 
-#: ../src/groupchat_control.py:1105
+#: ../src/groupchat_control.py:1100
 msgid "If you close this window, you will be disconnected from this room."
 msgstr "如果关闭此窗口，您将断开此房间的连接。"
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1104
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "不再提问此问题（_N）"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1138
 msgid "Changing Subject"
 msgstr "正在更换话题"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1139
 msgid "Please specify the new subject:"
 msgstr "请指定新话题："
 
-#: ../src/groupchat_control.py:1152
+#: ../src/groupchat_control.py:1147
 msgid "Changing Nickname"
 msgstr "正在更换昵称"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1148
 msgid "Please specify the new nickname you want to use:"
 msgstr "请指定您想使用的新昵称："
 
-#: ../src/groupchat_control.py:1178
+#: ../src/groupchat_control.py:1173
 msgid "Bookmark already set"
 msgstr "书签已设定"
 
-#: ../src/groupchat_control.py:1179
+#: ../src/groupchat_control.py:1174
 #, python-format
 msgid "Room \"%s\" is already in your bookmarks."
 msgstr "房间“%s”已在您的书签中。"
 
-#: ../src/groupchat_control.py:1189
+#: ../src/groupchat_control.py:1183
 msgid "Bookmark has been added successfully"
 msgstr "书签添加成功"
 
-#: ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1184
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "您可以通过“动作”菜单管理您的名单。"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1293
 #, python-format
 msgid "Kicking %s"
 msgstr "踢出 %s"
 
-#: ../src/groupchat_control.py:1300 ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1294 ../src/groupchat_control.py:1539
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因："
 
 #. ask for reason
-#: ../src/groupchat_control.py:1539
+#: ../src/groupchat_control.py:1538
 #, python-format
 msgid "Banning %s"
 msgstr "封禁 %s"
@@ -1861,111 +1891,120 @@ msgstr "<b>高级设置编辑器</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>应用</b>"
 
+#: ../src/gtkgui.glade.h:7
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr ""
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Custom</b>"
 msgstr "<b>自定义</b>"
 
-#: ../src/gtkgui.glade.h:9
+#: ../src/gtkgui.glade.h:10
 msgid "<b>Description</b>"
 msgstr "<b>描述</b>"
 
-#: ../src/gtkgui.glade.h:10
+#: ../src/gtkgui.glade.h:11
 msgid "<b>Format of a line</b>"
 msgstr "<b>行格式</b>"
 
-#: ../src/gtkgui.glade.h:11
+#: ../src/gtkgui.glade.h:12
 msgid "<b>Interface Customization</b>"
 msgstr "<b>界面订制</b>"
 
-#: ../src/gtkgui.glade.h:12
+#: ../src/gtkgui.glade.h:13
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber 通信</b>"
 
-#: ../src/gtkgui.glade.h:13
+#: ../src/gtkgui.glade.h:14
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>杂项</b>"
 
-#: ../src/gtkgui.glade.h:14
+#: ../src/gtkgui.glade.h:15
 msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
+#: ../src/gtkgui.glade.h:16
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../src/gtkgui.glade.h:16
+#: ../src/gtkgui.glade.h:17
 msgid "<b>Personal Information</b>"
 msgstr "<b>个人信息</b>"
 
-#: ../src/gtkgui.glade.h:17
+#: ../src/gtkgui.glade.h:18
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>请选择一个选项</b>："
 
-#: ../src/gtkgui.glade.h:18
+#: ../src/gtkgui.glade.h:19
 msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>请填写您新同账户的数据</b>"
 
-#: ../src/gtkgui.glade.h:19
+#: ../src/gtkgui.glade.h:20
 #, fuzzy
 msgid "<b>Please modify your special notification below</b>"
 msgstr "<b>请选择一个选项</b>："
 
-#: ../src/gtkgui.glade.h:20
+#: ../src/gtkgui.glade.h:21
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>预设状态消息</b>"
 
-#: ../src/gtkgui.glade.h:21
+#: ../src/gtkgui.glade.h:22
 msgid "<b>Properties</b>"
 msgstr "<b>属性</b>"
 
-#: ../src/gtkgui.glade.h:22
+#: ../src/gtkgui.glade.h:23
 msgid "<b>Settings</b>"
 msgstr "<b>设置</b>"
 
-#: ../src/gtkgui.glade.h:23
+#: ../src/gtkgui.glade.h:24
 msgid "<b>Sounds</b>"
 msgstr "<b>声音</b>"
 
-#: ../src/gtkgui.glade.h:24
+#: ../src/gtkgui.glade.h:25
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "输入新的消息："
 
-#: ../src/gtkgui.glade.h:25
+#: ../src/gtkgui.glade.h:26
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>可视化提示</b>"
 
-#: ../src/gtkgui.glade.h:26
+#: ../src/gtkgui.glade.h:27
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>想做什么？</b>"
 
-#: ../src/gtkgui.glade.h:27
+#: ../src/gtkgui.glade.h:28
 msgid "<b>XML Input</b>"
 msgstr "<b>XML 输入</b>"
 
-#: ../src/gtkgui.glade.h:28
+#: ../src/gtkgui.glade.h:29
 msgid "A list of active, completed and stopped file transfers"
 msgstr "文件发送、完成和中止的清单"
 
-#: ../src/gtkgui.glade.h:29
+#: ../src/gtkgui.glade.h:30
 msgid "A_ccounts"
 msgstr "账户(_A)"
 
-#. "About" is the text of a tab of vcard window
 #: ../src/gtkgui.glade.h:31
+#, fuzzy
+msgid "A_fter nickname:"
+msgstr "在昵称后："
+
+#. "About" is the text of a tab of vcard window
+#: ../src/gtkgui.glade.h:33
 msgid "About"
 msgstr "关于"
 
-#: ../src/gtkgui.glade.h:32
+#: ../src/gtkgui.glade.h:34
 msgid "Accept"
 msgstr "接受"
 
-#: ../src/gtkgui.glade.h:33
+#: ../src/gtkgui.glade.h:35
 msgid "Account"
 msgstr "账户"
 
-#: ../src/gtkgui.glade.h:34
+#: ../src/gtkgui.glade.h:36
 msgid ""
 "Account\n"
 "Group\n"
@@ -1977,52 +2016,44 @@ msgstr ""
 "联系人\n"
 "标语"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:40
 msgid "Account Modification"
 msgstr "帐户修改"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:41
 msgid "Accounts"
 msgstr "帐户"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Ad_vanced Actions"
 msgstr "高级动作(_V)"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 msgid "Add New Contact"
 msgstr "添加联系人"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 #, fuzzy
 msgid "Add Special _Notification"
 msgstr "<b>可视化提示</b>"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Add _Contact"
 msgstr "添加联系人(_C)"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Address"
 msgstr "地址"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Advanced"
 msgstr "高级"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Advanced Configuration Editor"
 msgstr "高级设置编辑器"
 
-#: ../src/gtkgui.glade.h:47
-msgid "After nickname:"
-msgstr "在昵称后："
-
-#: ../src/gtkgui.glade.h:48
-msgid "After time:"
-msgstr "在时间后："
-
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:50
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -2032,55 +2063,55 @@ msgstr ""
 "仅在书写\n"
 "禁用"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:53
 msgid "Allow _OS information to be sent"
 msgstr "允许发送操作系统信息(_O)"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:54
 msgid "Allow him/her to see my status"
 msgstr "允许他人看到我的状态"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "允许提示，当我离开/不可用/忙/隐身"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Also known as iChat style"
 msgstr "也就是 i 聊天风格"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Ask status message when I:"
 msgstr "询问状态消息，当我："
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Ask to see his/her status"
 msgstr "要求查看他人的状态"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Ask:"
 msgstr "请求："
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Assign Open_PGP Key"
 msgstr "指定 Open_PGP 密钥"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Authorize contact so he can know when you're connected"
 msgstr "向联系人授权，使他知道您是否连接"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid "Auto _away after:"
 msgstr "自动离开(_A)："
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:63
 msgid "Auto _not available after:"
 msgstr "自动不可用(_N)："
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:64
 msgid "Auto join"
 msgstr "自动加入"
 
-#: ../src/gtkgui.glade.h:64
+#: ../src/gtkgui.glade.h:65
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -2092,15 +2123,15 @@ msgstr ""
 "总是使用 KDE 默认应用\n"
 "自定义"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Automatically authorize contact"
 msgstr "自动向联系人授权"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Autoreconnect when connection is lost"
 msgstr "连接丢失后自动重新连接"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid ""
 "Available\n"
 "Free for Chat\n"
@@ -2113,13 +2144,10 @@ msgid ""
 "Offline"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Before nickname:"
-msgstr "在昵称前："
-
 #: ../src/gtkgui.glade.h:80
-msgid "Before time:"
-msgstr "在时间前："
+#, fuzzy
+msgid "B_efore nickname:"
+msgstr "在昵称前："
 
 #: ../src/gtkgui.glade.h:81
 msgid "Birthday:"
@@ -2230,132 +2258,136 @@ msgid "Company:"
 msgstr "公司："
 
 #: ../src/gtkgui.glade.h:106
+msgid "Composing"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:107
 msgid "Configure _Room"
 msgstr "设置房间(_R)"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Connect when I press Finish"
 msgstr "当我点击“结束”时连接"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Connection"
 msgstr "连接"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Contact Information"
 msgstr "联系人信息"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "Contact _Info"
 msgstr "联系人信息(_I)"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Conversation History"
 msgstr "对话历史"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Country:"
 msgstr "国家："
 
-#: ../src/gtkgui.glade.h:113
-msgid "Default _status iconset:"
+#: ../src/gtkgui.glade.h:114
+#, fuzzy
+msgid "Default status _iconset:"
 msgstr "默认状态图标设置(_S)"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "Delete MOTD"
 msgstr "删除 MOTD"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "Delete Message of the Day"
 msgstr "删除每日消息"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:117
 msgid "Deletes Message of the Day"
 msgstr "删除每日消息"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Deny"
 msgstr "拒绝"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr "拒绝向联系人授权。他人将无法知道您是否在线"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid "Department:"
 msgstr "部门："
 
-#: ../src/gtkgui.glade.h:120
-msgid "Display avatars of contacts in roster"
+#: ../src/gtkgui.glade.h:121
+#, fuzzy
+msgid "Display a_vatars of contacts in roster"
 msgstr "显示名单中的联系人明细"
 
-#: ../src/gtkgui.glade.h:121
-msgid "Display status messages of contacts in roster"
+#: ../src/gtkgui.glade.h:122
+#, fuzzy
+msgid "Display status _messages of contacts in roster"
 msgstr "显示名单中联系人的状态消息"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid "E-Mail:"
 msgstr "E-Mail ："
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
+#, fuzzy
+msgid "E_very 5 minutes"
+msgstr "每 5 分钟(_M)"
+
+#: ../src/gtkgui.glade.h:125
 msgid "Edit Groups"
 msgstr "编辑群组"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "Edit Personal Information..."
 msgstr "编辑个人信息..."
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "Edit _Groups"
 msgstr "编辑群组"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Emoticons:"
 msgstr "表情符管理"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Enable"
 msgstr "启用"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Enter it again for confirmation:"
 msgstr "再次输入以确认："
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Enter new password:"
 msgstr "输入新密码"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Events"
 msgstr "事件"
 
-#: ../src/gtkgui.glade.h:132
-msgid "Every 5 _minutes"
-msgstr "每 5 分钟(_M)"
-
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "Extra Address:"
 msgstr "附加地址："
 
 #. Family Name
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "Family:"
 msgstr "家族："
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid "File Transfers"
 msgstr "文件传输"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "File _Transfers"
 msgstr "文件传输(_T)"
 
-#: ../src/gtkgui.glade.h:138
-msgid "File manager:"
-msgstr "文件管理器："
-
 #: ../src/gtkgui.glade.h:139
 msgid "Filter:"
 msgstr "过滤器："
@@ -2365,39 +2397,35 @@ msgid "Font style:"
 msgstr "字体风格："
 
 #: ../src/gtkgui.glade.h:141
-msgid "Font:"
-msgstr "字体："
-
-#: ../src/gtkgui.glade.h:142
 msgid "Forbid him/her to see my status"
 msgstr "禁止他人看到我的状态"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid "Format: YYYY-MM-DD"
 msgstr "格式： YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid "Frequently Asked Questions (online)"
 msgstr "被频繁提问的问题 (在线)"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "From:"
 msgstr "从："
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:145
 msgid "G_o"
 msgstr "到(_O)"
 
-#: ../src/gtkgui.glade.h:147 ../src/notify.py:179 ../src/notify.py:193
-#: ../src/notify.py:204 ../src/tooltips.py:342
+#: ../src/gtkgui.glade.h:146 ../src/notify.py:167 ../src/notify.py:189
+#: ../src/notify.py:201 ../src/tooltips.py:339
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Gajim Themes Customization"
 msgstr "Gajim 主题自定义"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:148
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2405,50 +2433,58 @@ msgid ""
 "send to the other party."
 msgstr "Gajim 可以收发您与联系人所进行谈话的相关信息"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:149
 #, fuzzy
 msgid ""
 "Gajim will automatically show new events by poping up the relative window"
 msgstr "Gajim 会在已有的聊天窗口中打开新的窗口或标签以显示新抵达的消息"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:150
 #, fuzzy
 msgid ""
 "Gajim will notify you for new events via a popup in the bottom right of the "
 "screen"
 msgstr "Gajim 会通过屏幕右下方的弹出气泡提示新消息"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:151
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
 msgstr "Gajim 会通过屏幕右下方的弹出气泡提示刚刚登录的联系人"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:152
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr "Gajim 会通过屏幕右下方的弹出气泡提示刚刚离开的联系人"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:153
 #, fuzzy
 msgid ""
 "Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim 会改变发送了新消息的联系人的图标"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:154
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim： 帐户创建向导"
 
-#: ../src/gtkgui.glade.h:156 ../src/roster_window.py:250
+#. user has no group, print him in General
+#: ../src/gtkgui.glade.h:155 ../src/roster_window.py:265
+#: ../src/roster_window.py:1117 ../src/roster_window.py:1335
+#: ../src/systray.py:261
 msgid "General"
 msgstr "常规"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:157
 msgid "Given:"
 msgstr "教名："
 
+#: ../src/gtkgui.glade.h:158
+#, fuzzy
+msgid "Gone"
+msgstr "(无)"
+
 #: ../src/gtkgui.glade.h:159
 msgid "Group:"
 msgstr "群组"
@@ -2496,17 +2532,23 @@ msgid "I would like to add you to my contact list."
 msgstr "我想添加您到我的联系人名单"
 
 #: ../src/gtkgui.glade.h:170
-msgid "If checked, Gajim will also have a trayicon"
-msgstr "如果选定，Gajim 同样可以显示系统托盘图标"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working right."
+msgstr ""
 
 #: ../src/gtkgui.glade.h:171
-msgid "If checked, Gajim will display avatars of contacts in roster window"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr "如果选定，Gajim 会在窗口中显示名单中的联系人明细"
 
 #: ../src/gtkgui.glade.h:172
+#, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window"
+"name in roster window and in group chats"
 msgstr "如果选定，Gajim 会在窗口中联系人名下方显示联系人状态消息"
 
 #: ../src/gtkgui.glade.h:173
@@ -2576,8 +2618,9 @@ msgstr ""
 "像属于同一个帐户"
 
 #: ../src/gtkgui.glade.h:183
-msgid "Incoming message:"
-msgstr "消息抵达："
+#, fuzzy
+msgid "Inactive"
+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:185
@@ -2613,39 +2656,57 @@ msgid "Location"
 msgstr "定位"
 
 #: ../src/gtkgui.glade.h:194
+#, fuzzy
+msgid ""
+"MUC\n"
+"Messages"
+msgstr "消息"
+
+#: ../src/gtkgui.glade.h:196
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:198
+#, fuzzy
+msgid "Ma_nage..."
+msgstr "管理..."
+
+#: ../src/gtkgui.glade.h:199
 msgid "Manage Accounts"
 msgstr "帐户管理"
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
 msgid "Manage Bookmarks"
 msgstr "书签管理"
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:201
 msgid "Manage Proxy Profiles"
 msgstr "代理服务器模板管理"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:202
 msgid "Manage..."
 msgstr "管理..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:204
 msgid "Middle:"
 msgstr "中间："
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:205
 msgid "Mo_derator"
 msgstr "仲裁人(_D)"
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:206
 msgid "More"
 msgstr "更多"
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:207
 msgid "Name:"
 msgstr "名称："
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:208
 msgid ""
 "Never\n"
 "Always\n"
@@ -2653,109 +2714,105 @@ msgid ""
 "Per type"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:212
 msgid "Nickname:"
 msgstr "昵称："
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:213
 msgid ""
 "No Sound\n"
 "Select Sound..."
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:217
 msgid "None"
 msgstr "(无)"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:218
 msgid "Notify me about contacts that: "
 msgstr "提醒我关于联系人："
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:219
 msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:220
 msgid "OS:"
 msgstr "操作系统："
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:221
 msgid "On every _message"
 msgstr "对于每条消息(_M)"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:222
 #, fuzzy
 msgid "One message _window:"
 msgstr "发送消息并关闭窗口"
 
-#: ../src/gtkgui.glade.h:218
-msgid "Open..."
-msgstr "打开..."
-
-#: ../src/gtkgui.glade.h:220
-msgid "Outgoing message:"
-msgstr "消息送出："
-
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:224
 msgid "Pass_word:"
 msgstr "密码(_W)"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:225
 msgid "Passphrase"
 msgstr "密文"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:226
 msgid "Password:"
 msgstr "密码："
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:227 ../src/tooltips.py:645
+msgid "Paused"
+msgstr "已暂停"
+
+#: ../src/gtkgui.glade.h:228
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Phone No.:"
 msgstr "电话号码："
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Play _sounds"
 msgstr "播放声音(_S)"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Port: "
 msgstr "端口："
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Position:"
 msgstr "位置："
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:233
 msgid "Postal Code:"
 msgstr "邮政编码："
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:234
 msgid "Preferences"
 msgstr "参数"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:236
 msgid "Prefix:"
 msgstr "前缀："
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:237
 #, fuzzy
 msgid "Preset messages:"
 msgstr "状态消息"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:238
 msgid "Print time:"
 msgstr "显示时间："
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:239
 msgid "Priori_ty:"
 msgstr "优先级(_T):"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:240
 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 "
@@ -2764,59 +2821,51 @@ msgstr ""
 "优先级是当多个客户端使用同一帐户连接到服务器时， Jabber 决定事件响应对象的依"
 "据。"
 
-#: ../src/gtkgui.glade.h:237
-msgid "Profile, Avatar"
-msgstr "模板，明细"
-
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Protocol:"
 msgstr "协议："
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Proxy:"
 msgstr "代理服务器："
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Query Builder..."
 msgstr "查询生成器..."
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Recently:"
 msgstr "最近："
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Register to"
 msgstr "注册到"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Remove account _only from Gajim"
 msgstr "仅从 Gajim 移除帐户(_O)"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Remove account from Gajim and from _server"
 msgstr "同时从 Gajim 和服务器移除帐户(_S)"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Remove file transfer from the list."
 msgstr "从列表移除文件传输"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr "从列表移除已完成，已取消和失败的文件传输"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Reply to this message"
 msgstr "回复本条消息"
 
-#: ../src/gtkgui.glade.h:248
-msgid "Reset to Default Colors"
-msgstr "恢复为默认颜色设置"
-
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:251
 msgid "Resour_ce: "
 msgstr "资源(_C)："
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:252
 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 "
@@ -2828,168 +2877,160 @@ msgstr ""
 "分。您可以利用“家庭”和“工作”两个资源同时连接到服务器。拥有更高优先级的资源得"
 "到服务器的事件响应。"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:253
 msgid "Resource:"
 msgstr "资源："
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:254
 msgid "Role:"
 msgstr "角色："
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:255
 msgid "Room Configuration"
 msgstr "房间设置："
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:256
 msgid "Room:"
 msgstr "房间："
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:257
 msgid "Save _passphrase (insecure)"
 msgstr "保存密文(_P)(不安全)"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:258
 msgid "Save _position and size for roster and chat windows"
 msgstr "保存名单和聊天窗口的位置及大小(_P)"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:259
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "另存为..."
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:260
 msgid "Save conversation _logs for all contacts"
 msgstr "保存与所有联系人的聊天记录(_L)"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:261
 msgid "Save pass_word"
 msgstr "保存密码(_W)"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:262
 #, fuzzy
 msgid "Search"
 msgstr "查找(_S)"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:263
 msgid "Sen_d"
 msgstr "发送(_D)"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:264
 msgid "Send File"
 msgstr "发送文件"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:265
 msgid "Send Single _Message"
 msgstr "发送单条消息(_M)"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:266
 msgid "Send _File"
 msgstr "发送文件(_F)"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:267
 msgid "Send _New Message..."
 msgstr "发送新消息(_N)"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:268
 msgid "Send keep-alive packets"
 msgstr "发送防超时数据包"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:269
 msgid "Send message"
 msgstr "发送消息"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:270
 msgid "Send message and close window"
 msgstr "发送消息并关闭窗口"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:271
 msgid "Sends a message to currently connected users to this server"
 msgstr "发送消息至连接到当前服务器的用户"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:272
 msgid "Server:"
 msgstr "服务器："
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:273
 msgid "Servers Features"
 msgstr "服务器设定"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:274
 msgid "Set MOTD"
 msgstr "设定 MOTD"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:275
 msgid "Set Message of the Day"
 msgstr "设定每日消息"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:276
 msgid "Set _Avatar"
 msgstr "详细设置"
 
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Set an avatar when I connect"
 msgstr "连接时详细设置"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Sets Message of the Day"
 msgstr "设定每日消息"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Show All Pending _Events"
 msgstr "显示所有未决事件"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Show _Offline Contacts"
 msgstr "显示离线联系人"
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:281
 msgid "Show _Roster"
 msgstr "显示名单(_R)"
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Show _XML Console"
 msgstr "显示 XML 控制台(_X)"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Show only in _roster"
 msgstr "只显示名单中(_R)"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Shows a list of file transfers between you and other"
 msgstr "显示文件传输列表"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Sign _in"
 msgstr "登录(I)"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "Sign _out"
 msgstr "退出登录"
 
-#: ../src/gtkgui.glade.h:285
-msgid "Sort contacts by status"
-msgstr "按状态分类联系人"
-
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:287
 msgid "Sta_tus"
 msgstr "状态(_T)"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:288
 msgid "Start _Chat"
 msgstr "开始群聊(_C)"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:289
 msgid "State:"
 msgstr "州："
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:290
 msgid "Status"
 msgstr "状态"
 
-#: ../src/gtkgui.glade.h:290
-msgid "Status message:"
-msgstr "状态消息："
-
 #: ../src/gtkgui.glade.h:291
 msgid "Status:"
 msgstr "状态："
@@ -3020,25 +3061,26 @@ msgid "Synch_ronize account status with global status"
 msgstr "将帐户状态与全局状态同步(_R)"
 
 #: ../src/gtkgui.glade.h:299
+#, fuzzy
+msgid "T_heme:"
+msgstr "主题："
+
+#: ../src/gtkgui.glade.h:300
 msgid "Text _color:"
 msgstr "文本颜色(_C)："
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:301
 msgid "Text _font:"
 msgstr "文本字体(_F)："
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:302
 msgid "The auto away status message"
 msgstr "自动离开状态消息"
 
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "The auto not available status message"
 msgstr "自动不可用状态消息"
 
-#: ../src/gtkgui.glade.h:303
-msgid "Theme:"
-msgstr "主题："
-
 #: ../src/gtkgui.glade.h:304
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
@@ -3062,50 +3104,56 @@ msgid "Type:"
 msgstr "类型："
 
 #: ../src/gtkgui.glade.h:309
-msgid "URL:"
-msgstr "URL："
-
-#: ../src/gtkgui.glade.h:310
 msgid "Underline"
 msgstr "下划线"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:310
 msgid "Update MOTD"
 msgstr "更新 MOTD"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:311
 msgid "Update Message of the Day"
 msgstr "更新每日消息"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:312
 msgid "Updates Message of the Day"
 msgstr "更新每日消息"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:313
 msgid "Use _SSL (legacy)"
 msgstr "使用 SSL(_S) (优先)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:314
 msgid "Use _transports iconsets"
 msgstr "使用代理的图标设定(_T)"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:315
 msgid "Use authentication"
 msgstr "使用验证"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:316
 msgid "Use custom hostname/port"
 msgstr "使用自定义主机名/端口号"
 
+#: ../src/gtkgui.glade.h:317
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "文件传输列表"
+
 #: ../src/gtkgui.glade.h:318
+#, fuzzy
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr "系统托盘图标(_I)"
+
+#: ../src/gtkgui.glade.h:319
 msgid "User ID:"
 msgstr "用户 ID"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "When a file transfer is complete show a popup notification"
 msgstr "传输完成后显示弹出气泡提示"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 #, fuzzy
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
@@ -3116,21 +3164,21 @@ msgstr ""
 "下列措施可以向您提示新事件的发生(消息，文件传输请求等..)。注意：来自未处于聊"
 "天中的联系人的消息，才会触发新事件"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "When new event is received"
 msgstr "当新事件发生时"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "Work"
 msgstr "工作"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid ""
 "Yes\n"
 "No"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -3138,414 +3186,454 @@ msgstr ""
 "您需要一个帐户来连接\n"
 "Jabber 网络"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "Your JID:"
 msgstr "您的 JID："
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Actions"
 msgstr "动作(_A)"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Add Contact..."
 msgstr "添加联系人(_A)..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Add to Roster"
 msgstr "添加至名单(_A)"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Address:"
 msgstr "地址(_A):"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Admin"
 msgstr "管理(_A)"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:335
 msgid "_Administrator"
 msgstr "管理员(_A)"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_Advanced"
 msgstr "高级(_A)"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
+#, fuzzy
+msgid "_After time:"
+msgstr "在时间后："
+
+#: ../src/gtkgui.glade.h:338
 msgid "_Authorize"
 msgstr "授权(_A)"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:339
 msgid "_Background:"
 msgstr "背景(_B)"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:340
 msgid "_Ban"
 msgstr "封禁(_B)"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:341
+#, fuzzy
+msgid "_Before time:"
+msgstr "在时间前："
+
+#: ../src/gtkgui.glade.h:342
 msgid "_Bookmark This Room"
 msgstr "将本房间加入书签(_B)"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:343
 msgid "_Browser:"
 msgstr "浏览器(_B)："
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:344
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:345
 msgid "_Compact View    Alt+C"
 msgstr "紧凑模式(_C)  Alt+C"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:346
 msgid "_Contents"
 msgstr "内容(_C)"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:348
 msgid "_Copy JID/Email Address"
 msgstr "复制 JID/电子邮件地址(_C)"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:349
 msgid "_Copy Link Location"
 msgstr "复制连接位置(_C)"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:350
 msgid "_Deny"
 msgstr "拒绝(_D)"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:351
 msgid "_Discover Services"
 msgstr "发掘服务(_D)"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:352
 msgid "_Discover Services..."
 msgstr "发掘服务(_D)..."
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:354
 msgid "_FAQ"
 msgstr "常见问题(_A)"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:355
+#, fuzzy
+msgid "_File manager:"
+msgstr "文件管理器："
+
+#: ../src/gtkgui.glade.h:356
 msgid "_Filter:"
 msgstr "过滤器(_F):"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:357
 msgid "_Finish"
 msgstr "完成(_F)"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:358
+#, fuzzy
+msgid "_Font:"
+msgstr "字体："
+
+#: ../src/gtkgui.glade.h:359
 msgid "_Group Chat"
 msgstr "群聊(_G)"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Highlight misspelled words"
 msgstr "拼写检查(_H)"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_History"
 msgstr "历史(_H)"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 msgid "_Host:"
 msgstr "主机(_H)："
 
 #. 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:360
+#: ../src/gtkgui.glade.h:365
 msgid "_IQ"
 msgstr "IQ(_I)"
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Icon in systray (aka. notification area)"
-msgstr "系统托盘图标(_I)"
-
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:366
 msgid "_Ignore events from contacts not in the roster"
 msgstr "忽略名单以外的联系人触发的事件(_I)"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:367
+#, fuzzy
+msgid "_Incoming message:"
+msgstr "消息抵达："
+
+#: ../src/gtkgui.glade.h:368
 msgid "_Jabber ID:"
 msgstr "Jabber ID(_J)："
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Join New Room..."
 msgstr "加入新房间(_J)..."
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Kick"
 msgstr "踢除(_K)"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Log conversation history"
 msgstr "记录聊天历史(_L)"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Log status changes of contacts"
 msgstr "记录联系人状态变化(_L)"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Mail client:"
 msgstr "邮件客户端(_M)："
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Member"
 msgstr "成员(_M)"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Merge accounts"
 msgstr "合并帐户(_M)"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Message"
 msgstr "消息(_M)"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Modify Account..."
 msgstr "修改帐户(_M)..."
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Name: "
 msgstr "名称(_N)："
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:381
 msgid "_Never"
 msgstr "从不(_N)"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Notify me about it"
 msgstr "提醒我(_N)"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Notify me when a file transfer is complete"
 msgstr "文件传输完成时提醒我(_N)"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Occupant Actions"
 msgstr "房主动作(_O)"
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Online Users"
-msgstr "在线用户(_O)"
-
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:387
 msgid "_Open Email Composer"
 msgstr "打开邮件编辑器(_O)"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:388
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开连接(_O)"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:389
+#, fuzzy
+msgid "_Open..."
+msgstr "打开..."
+
+#: ../src/gtkgui.glade.h:390
+#, fuzzy
+msgid "_Outgoing message:"
+msgstr "消息送出："
+
+#: ../src/gtkgui.glade.h:391
 msgid "_Owner"
 msgstr "拥有人(_O)"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:392
 msgid "_Password:"
 msgstr "密码(_P)："
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:393
 msgid "_Pause"
 msgstr "暂停(_P)"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:394
 msgid "_Player:"
 msgstr "参与者(_P)"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:395
 msgid "_Pop it up"
 msgstr "弹出(_P)"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:396
 msgid "_Port:"
 msgstr "端口(_P)"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:397
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:398
 msgid "_Presence"
 msgstr "在场(_P)"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:399
 msgid "_Publish"
 msgstr "发布(_P)"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:400
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:401
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../src/gtkgui.glade.h:396 ../src/roster_window.py:1297
+#: ../src/gtkgui.glade.h:402 ../src/roster_window.py:1412
 msgid "_Remove from Roster"
 msgstr "从名单中移除(_R)"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:403 ../src/roster_window.py:1400
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:404
 msgid "_Reply"
 msgstr "回复(_R)"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:405
+#, fuzzy
+msgid "_Reset to Default Colors"
+msgstr "恢复为默认颜色设置"
+
+#: ../src/gtkgui.glade.h:406
 msgid "_Retrieve"
 msgstr "找回(_R)"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:407
 #, fuzzy
 msgid "_Retype Password:"
 msgstr "密码(_P)："
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:408
 msgid "_Search"
 msgstr "查找(_S)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:403
-msgid "_Send"
-msgstr "发送(_S)"
-
-#: ../src/gtkgui.glade.h:404
+#: ../src/gtkgui.glade.h:411
 msgid "_Send & Close"
 msgstr "发送并关闭(_S)"
 
-#: ../src/gtkgui.glade.h:405
+#: ../src/gtkgui.glade.h:412
 msgid "_Send Private Message"
 msgstr "发送私聊消息(_S)"
 
-#: ../src/gtkgui.glade.h:406
+#: ../src/gtkgui.glade.h:413
 msgid "_Send Server Message"
 msgstr "发送服务器消息(_S)"
 
-#: ../src/gtkgui.glade.h:407
+#: ../src/gtkgui.glade.h:414
 msgid "_Send Single Message"
 msgstr "发送单条消息(_S)"
 
-#: ../src/gtkgui.glade.h:408
+#: ../src/gtkgui.glade.h:415
 msgid "_Server:"
 msgstr "服务器(_S)："
 
-#: ../src/gtkgui.glade.h:409
+#: ../src/gtkgui.glade.h:416
+#, fuzzy
+msgid "_Sort contacts by status"
+msgstr "按状态分类联系人"
+
+#: ../src/gtkgui.glade.h:417
 msgid "_Start Chat"
 msgstr "开始聊天(_S)"
 
-#: ../src/gtkgui.glade.h:410
+#: ../src/gtkgui.glade.h:418
 msgid "_Status"
 msgstr "状态(_S)"
 
-#: ../src/gtkgui.glade.h:411
+#: ../src/gtkgui.glade.h:419
+#, fuzzy
+msgid "_Status message:"
+msgstr "状态消息："
+
+#: ../src/gtkgui.glade.h:420
 msgid "_Subscribe"
 msgstr "认证(_S)"
 
-#: ../src/gtkgui.glade.h:412
+#: ../src/gtkgui.glade.h:421
 msgid "_Subscription"
 msgstr "认证(_S)"
 
-#: ../src/gtkgui.glade.h:413
+#: ../src/gtkgui.glade.h:422
+#, fuzzy
+msgid "_URL:"
+msgstr "URL："
+
+#: ../src/gtkgui.glade.h:423
 msgid "_Use proxy"
 msgstr "使用代理服务器(_U)"
 
-#: ../src/gtkgui.glade.h:414
+#: ../src/gtkgui.glade.h:424
 msgid "_Username:"
 msgstr "用户名(_U)："
 
-#: ../src/gtkgui.glade.h:415
+#: ../src/gtkgui.glade.h:425
 msgid "_Voice"
 msgstr "语音(_V)"
 
-#: ../src/gtkgui.glade.h:416
+#: ../src/gtkgui.glade.h:426
 msgid "_XML Console..."
 msgstr "XML 控制(_X)..."
 
-#: ../src/gtkgui.glade.h:417
+#: ../src/gtkgui.glade.h:427
 msgid "file transfers list"
 msgstr "文件传输列表"
 
-#: ../src/gtkgui.glade.h:418
+#: ../src/gtkgui.glade.h:428
 msgid "minutes"
 msgstr "分钟"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:99 ../src/gtkgui_helpers.py:114
+#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/gtkgui_helpers.py:247
+#: ../src/gtkgui_helpers.py:242
 msgid "Error reading file:"
 msgstr "读文件错误："
 
-#: ../src/gtkgui_helpers.py:250
+#: ../src/gtkgui_helpers.py:245
 msgid "Error parsing file:"
 msgstr "分析文件错误："
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:288
+#: ../src/gtkgui_helpers.py:283
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "不能写入到 %s 。会话管理支持功能未启用"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: ../src/history_manager.glade.h:7
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
+#: ../src/history_manager.glade.h:1
 msgid ""
-"<big>Welcome to Gajim History Logs Manager</big>\n"
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
 "\n"
 "You can select logs from the left and/or search database from below.\n"
 "\n"
-"<b>NOTE:</b> If you plan to do massive deletions, please make sure Gajim is "
-"not running."
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 
-#: ../src/history_manager.glade.h:13
-#, fuzzy
-msgid "_Search Database"
-msgstr "查找(_S)"
-
-#: ../src/history_manager.glade.h:14
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:15
+#: ../src/history_manager.glade.h:7
 #, fuzzy
 msgid "Delete"
 msgstr "删除 MOTD"
 
-#: ../src/history_manager.py:55
+#: ../src/history_manager.glade.h:8
+msgid "Export"
+msgstr ""
+
+#: ../src/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr ""
+
+#: ../src/history_manager.glade.h:10
+#, fuzzy
+msgid "_Search Database"
+msgstr "查找(_S)"
+
+#: ../src/history_manager.py:56
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "建立日志数据库"
 
 #: ../src/history_manager.py:162
-msgid "Do you want to clean up the database?"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:163
+#: ../src/history_manager.py:164
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -3554,34 +3642,34 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:315
-msgid "Do you really want to delete the selected message?"
-msgid_plural "Do you really want to delete the selected messages?"
-msgstr[0] ""
-
-#: ../src/history_manager.py:318 ../src/history_manager.py:442
-msgid "This is an irreversible operation."
-msgstr ""
-
-#: ../src/history_manager.py:359
+#: ../src/history_manager.py:352
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "正在移动日志..."
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:430
+#: ../src/history_manager.py:426
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:438
+#: ../src/history_manager.py:463
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] ""
 
+#: ../src/history_manager.py:467 ../src/history_manager.py:503
+msgid "This is an irreversible operation."
+msgstr ""
+
+#: ../src/history_manager.py:500
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] ""
+
 #: ../src/history_window.py:94
 msgid "Date"
 msgstr "日期"
@@ -3615,341 +3703,342 @@ msgstr "现在状态：%(status)s：%(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "现在状态： %(status)s "
 
-#: ../src/message_window.py:235
+#: ../src/message_window.py:233
 #, fuzzy
 msgid "Messages"
 msgstr "消息"
 
-#: ../src/message_window.py:236
+#: ../src/message_window.py:234
 #, fuzzy, python-format
 msgid "%s - Gajim"
 msgstr "Gajim"
 
-#: ../src/notify.py:142
-#, fuzzy
-msgid "Start Chat with Contact"
-msgstr "使用账户 %s 加入群聊"
-
-#: ../src/roster_window.py:150
+#: ../src/roster_window.py:140
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: ../src/roster_window.py:248
+#: ../src/roster_window.py:263 ../src/common/helpers.py:44
 #, fuzzy
 msgid "Observers"
 msgstr "服务器"
 
-#: ../src/roster_window.py:468
+#: ../src/roster_window.py:516
 #, python-format
 msgid "You are already in room %s"
 msgstr "房间“%s”已在您的书签中。"
 
-#: ../src/roster_window.py:473 ../src/roster_window.py:2070
+#: ../src/roster_window.py:520 ../src/roster_window.py:2203
 msgid "You cannot join a room while you are invisible"
 msgstr "隐身时无法加入房间。"
 
-#: ../src/roster_window.py:633
-msgid "_Join New Room"
-msgstr "加入新房间(_J)"
-
-#: ../src/roster_window.py:648
-msgid "Manage Bookmarks..."
-msgstr "书签管理..."
-
-#: ../src/roster_window.py:663
+#. the 'manage gc bookmarks' item is showed
+#. below to avoid duplicate code
+#. add
+#: ../src/roster_window.py:696
 #, python-format
 msgid "to %s account"
 msgstr "至帐户 %s"
 
-#: ../src/roster_window.py:675
+#. disco
+#: ../src/roster_window.py:703
 #, python-format
 msgid "using %s account"
 msgstr "使用账户 %s"
 
+#. new message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:689 ../src/systray.py:176 ../src/systray.py:181
+#: ../src/roster_window.py:711 ../src/systray.py:189 ../src/systray.py:195
 #, python-format
 msgid "using account %s"
 msgstr "使用账户 %s"
 
-#: ../src/roster_window.py:700
+#: ../src/roster_window.py:763
+msgid "Manage Bookmarks..."
+msgstr "书签管理..."
+
+#: ../src/roster_window.py:787
 #, python-format
 msgid "for account %s"
 msgstr "为帐户 %s"
 
-#: ../src/roster_window.py:1011
+#. History manager
+#: ../src/roster_window.py:808
+#, fuzzy
+msgid "History Manager"
+msgstr "历史(_H)"
+
+#: ../src/roster_window.py:817
+msgid "_Join New Room"
+msgstr "加入新房间(_J)"
+
+#: ../src/roster_window.py:1092
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理“%s”将被移除"
 
-#: ../src/roster_window.py:1011
+#: ../src/roster_window.py:1092
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr "您将无法从此代理收发消息。"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1134
 msgid "Assign OpenPGP Key"
 msgstr "指定您的 OpenPGP 钥匙"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1135
 msgid "Select a key to apply to the contact"
 msgstr "选择一个键应用于联系人。"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1290
 msgid "I would like to add you to my roster"
 msgstr "我想加您为好友"
 
-#: ../src/roster_window.py:1249
+#: ../src/roster_window.py:1340
 msgid "Re_name"
 msgstr "重命名(_N)"
 
-#: ../src/roster_window.py:1270
+#: ../src/roster_window.py:1371
 msgid "_Log on"
 msgstr "登入(_L)"
 
-#: ../src/roster_window.py:1279
+#: ../src/roster_window.py:1380
 msgid "Log _off"
 msgstr "退出登录(_O)"
 
-#: ../src/roster_window.py:1373
+#: ../src/roster_window.py:1482
 msgid "_Change Status Message"
 msgstr "更改状态消息(_C)"
 
-#: ../src/roster_window.py:1443
+#: ../src/roster_window.py:1564
 msgid "Authorization has been sent"
 msgstr "授权发送成功"
 
-#: ../src/roster_window.py:1444
+#: ../src/roster_window.py:1565
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "现在“%s”将知道您的状态。"
 
-#: ../src/roster_window.py:1468
+#: ../src/roster_window.py:1589
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: ../src/roster_window.py:1469
+#: ../src/roster_window.py:1590
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果“%s”接受此请求，您将知道他/她的状态。"
 
-#: ../src/roster_window.py:1480
+#: ../src/roster_window.py:1601
 msgid "Authorization has been removed"
 msgstr "授权被移除"
 
-#: ../src/roster_window.py:1481
+#: ../src/roster_window.py:1602
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "“%s” 将一直看到您的状态为离线。"
 
-#: ../src/roster_window.py:1629
+#: ../src/roster_window.py:1771
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人“%s”将从您的名单中移除"
 
-#: ../src/roster_window.py:1631
+#: ../src/roster_window.py:1775
+#, fuzzy
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr "移除此联系人的同时将默认移除认证，导致他/她将一直看到您为离线。"
+
+#: ../src/roster_window.py:1779
 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:1632
+#: ../src/roster_window.py:1780
 msgid "I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1848
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1849
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "为账户 %s 输入 GPG 密文"
 
-#: ../src/roster_window.py:1731
+#: ../src/roster_window.py:1854
 msgid "Save passphrase"
 msgstr "保存密文"
 
-#: ../src/roster_window.py:1739
+#: ../src/roster_window.py:1862
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "密文"
 
-#: ../src/roster_window.py:1740
+#: ../src/roster_window.py:1863
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1779 ../src/roster_window.py:1839
+#: ../src/roster_window.py:1911 ../src/roster_window.py:1967
 msgid "You are participating in one or more group chats"
 msgstr "您在一或多个群聊中"
 
-#: ../src/roster_window.py:1780 ../src/roster_window.py:1840
+#: ../src/roster_window.py:1912 ../src/roster_window.py:1968
 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:1799
+#: ../src/roster_window.py:1928
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1929
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/roster_window.py:2232 ../src/roster_window.py:2238
+#: ../src/roster_window.py:2365 ../src/roster_window.py:2371
 msgid "You have unread messages"
 msgstr "您有未读消息"
 
-#: ../src/roster_window.py:2233 ../src/roster_window.py:2239
+#: ../src/roster_window.py:2366 ../src/roster_window.py:2372
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr "启用历史后才能再次重读消息"
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3113
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "来自 %s ,房间 %s "
 
-#: ../src/roster_window.py:2982
-#, python-format
-msgid "Make %s as subcontact of %s"
-msgstr ""
+#: ../src/roster_window.py:3120
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "向联系人发送文件"
 
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3285
 msgid "Change Status Message..."
 msgstr "更改状态消息..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "更改状态消息_(C)..."
 
-#: ../src/systray.py:202
+#: ../src/systray.py:218
 msgid "Hide this menu"
 msgstr "隐藏本菜单"
 
-#: ../src/systray.py:264
-msgid "All contacts in this group are offline or have errors"
-msgstr "该组中所有联系人离线或有错误"
-
-#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:318
+#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
+#: ../src/tooltips.py:315
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %d 条未读消息 "
 
-#: ../src/tooltips.py:324
+#: ../src/tooltips.py:321
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - %d 条未读消息"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:327
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - %d 条未读群聊消息"
 
-#: ../src/tooltips.py:336
+#: ../src/tooltips.py:333
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - %d 未读私人消息"
 
-#: ../src/tooltips.py:351 ../src/tooltips.py:353
+#: ../src/tooltips.py:348 ../src/tooltips.py:350
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:385
+#: ../src/tooltips.py:383
 msgid "Role: "
 msgstr "角色："
 
-#: ../src/tooltips.py:388
+#: ../src/tooltips.py:384
 msgid "Affiliation: "
 msgstr "会籍："
 
-#: ../src/tooltips.py:391 ../src/tooltips.py:503 ../src/tooltips.py:519
-#: ../src/tooltips.py:600
-msgid "Status: "
-msgstr "状态"
-
-#: ../src/tooltips.py:401 ../src/tooltips.py:515
+#: ../src/tooltips.py:386 ../src/tooltips.py:518
 msgid "Resource: "
 msgstr "资源："
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
+#: ../src/tooltips.py:654
+msgid "Status: "
+msgstr "状态"
+
+#: ../src/tooltips.py:501
 msgid "Subscription: "
 msgstr "认证："
 
-#: ../src/tooltips.py:493
+#: ../src/tooltips.py:510
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:548
 #, fuzzy, python-format
 msgid "Last status on %s"
 msgstr "默认状态图标设置(_S)"
 
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:550
 #, fuzzy, python-format
 msgid "Since %s"
 msgstr "大小： %s"
 
-#: ../src/tooltips.py:577
-msgid "Type: "
-msgstr "类型"
-
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:610
 msgid "Download"
 msgstr "下载"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:616
 msgid "Upload"
 msgstr "上传"
 
-#: ../src/tooltips.py:593
-msgid "Size: "
-msgstr "大小："
+#: ../src/tooltips.py:623
+msgid "Type: "
+msgstr "类型"
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:629
 msgid "Transferred: "
 msgstr "已传输："
 
-#: ../src/tooltips.py:603 ../src/tooltips.py:624
+#: ../src/tooltips.py:632 ../src/tooltips.py:653
 msgid "Not started"
 msgstr "未开始"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:636
 msgid "Stopped"
 msgstr "已停止"
 
-#: ../src/tooltips.py:609 ../src/tooltips.py:612
+#: ../src/tooltips.py:638 ../src/tooltips.py:641
 msgid "Completed"
 msgstr "已完成"
 
-#: ../src/tooltips.py:616
-msgid "Paused"
-msgstr "已暂停"
-
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:620
+#: ../src/tooltips.py:649
 msgid "Stalled"
 msgstr "已冻结"
 
-#: ../src/tooltips.py:622
+#: ../src/tooltips.py:651
 msgid "Transferring"
 msgstr "传输中"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:683
 msgid "This service has not yet responded with detailed information"
 msgstr "服务无详细信息应答"
 
-#: ../src/tooltips.py:645
+#: ../src/tooltips.py:686
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3957,72 +4046,72 @@ msgstr ""
 "此服务无法返回详细信息。\n"
 "它可能是继承或损坏的"
 
-#: ../src/vcard.py:181
+#: ../src/vcard.py:175
 msgid "Choose Avatar"
 msgstr "选择明细"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:195
 msgid "Images"
 msgstr "形象"
 
 #. unknown format
-#: ../src/vcard.py:230
+#: ../src/vcard.py:224
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:304
 msgid "?Client:Unknown"
 msgstr "?Client: 未知"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:306
 msgid "?OS:Unknown"
 msgstr "?OS: 未知"
 
-#: ../src/vcard.py:328
+#: ../src/vcard.py:323
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "浏览 %s"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "此联系人对您的状态信息感兴趣，但您不关心他/她的状态"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "您对此联系人的状态信息感兴趣，但他/她不关心您的状态"
 
-#: ../src/vcard.py:352
+#: ../src/vcard.py:351
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
 #. None
-#: ../src/vcard.py:354
+#: ../src/vcard.py:353
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "您与他/她互不关心对方的状态信息"
 
-#: ../src/vcard.py:363
+#: ../src/vcard.py:362
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: ../src/vcard.py:375 ../src/vcard.py:398
+#: ../src/vcard.py:374 ../src/vcard.py:397
 msgid " resource with priority "
 msgstr "带有优先级的资源"
 
-#: ../src/vcard.py:477
+#: ../src/vcard.py:476
 msgid "Without a connection you can not publish your contact information."
 msgstr "无法脱机发布个人信息。"
 
-#: ../src/vcard.py:506
+#: ../src/vcard.py:505
 msgid "Without a connection, you can not get your contact information."
 msgstr "无法脱机获取个人信息。"
 
-#: ../src/vcard.py:510
+#: ../src/vcard.py:509
 #, fuzzy
 msgid "Personal details"
 msgstr "个人信息"
@@ -4065,72 +4154,74 @@ msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus 在此机器上不可用或 Python 模块缺失"
 
 #: ../src/common/exceptions.py:59
-msgid "Session bus is not available"
-msgstr "会话总线不可用"
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
 
-#: ../src/common/config.py:50
+#: ../src/common/config.py:53
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "使用 D-Bus 和通知进程显示通知"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:57
 msgid "Time in minutes, after which your status changes to away."
 msgstr "转换状态为“离开”之前的时间(分钟)。"
 
-#: ../src/common/config.py:55
+#: ../src/common/config.py:58
 msgid "Away as a result of being idle"
 msgstr "发呆导致的离开"
 
-#: ../src/common/config.py:57
+#: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "转换状态为“不可用”之前的时间(分钟)"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:61
 msgid "Not available as a result of being idle"
 msgstr "发呆导致的不可用"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:89
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr "如果为真，不要移除 */_。所以 *abc* 将被加粗但 * * 不会被移除"
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr "加入 * 和 [n] 在名单标题？"
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:132
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr "聊天标签/窗口被重新打开时显示的历史谈话行数"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:133
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "距上次谈话结束的分钟数"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:134
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr "用 Ctrl+回车 发行消息，回车开始新行(紫茉莉 ICQ 客户端默认操作)。"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:136
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ctrl+上箭头 存储行数。"
 
 #. which version created the config
-#: ../src/common/config.py:135
+#: ../src/common/config.py:138
 msgid "Use compact view when you open a chat window"
 msgstr "开启新聊天窗口时使用紧凑模式"
 
-#: ../src/common/config.py:136
+#: ../src/common/config.py:139
 msgid "Use compact view when you open a group chat window"
 msgstr "开启新群聊窗口时使用紧凑模式"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:141
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -4138,57 +4229,57 @@ msgid ""
 msgstr ""
 "自定义地址 %s 在 %s 是单词/短语时，或 'WIKTIONARY' 意味着使用 wiktionary。"
 
-#: ../src/common/config.py:141
+#: ../src/common/config.py:144
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果选中，Gajim 可以接受 gajim-remote 远程控制。"
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:148
 msgid "Ask before closing a group chat tab/window."
 msgstr "关闭群聊标签/窗口前询问。"
 
-#: ../src/common/config.py:146
+#: ../src/common/config.py:149
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "关闭群聊标签/窗口前询问。"
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:150
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of room jids."
 msgstr "关闭群聊标签/窗口前询问。"
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:153
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 msgstr "为防止地址翻译转发，忽略用以发起文件传输的主机"
 
-#: ../src/common/config.py:152
+#: ../src/common/config.py:155
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 标准规定 KiB = 1024 字节，KB = 1000 字节。"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Show tab when only one conversation?"
 msgstr "只有一个会话时显示标签？"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Show tab border if one conversation?"
 msgstr "一个会话时显示标签边框？"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
 msgid "Show close button in tab?"
 msgstr "在标签上显示关闭键？"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr "多用户聊天中，系统会高亮显示用分号隔开的发言列表"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:179
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -4196,11 +4287,11 @@ msgstr ""
 "如果是， 单击窗口管理器的 X 键，会退出 Gajim。这一设定仅当启用了系统托盘图标"
 "时才会生效。"
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:180
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "如果是， Gajim 会在每次启动时为 xmpp:// 注册。"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4208,40 +4299,40 @@ msgstr ""
 "如果是， Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题，该图标可能"
 "是动态的。"
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:182
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
 msgstr ""
 "如果是， Gajim 会在名单窗口中将每一个联系人的状态信息显示在它名字的下方"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
 msgstr "如果是， Gajim 会为每一个缓存过久或上次未获得明细的联系人请求明细"
 
 #. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 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 "如果否，您将无法看见与您聊天的联系人变更其状态和状态消息。"
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected room. "
 "Turn this option to False to stop sending sha info in groupchat presences"
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:195
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4252,14 +4343,25 @@ msgid ""
 "the changes will take effect"
 msgstr ""
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "If False, you will no longer see the avatar in the chat window"
 msgstr ""
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:197
 msgid "If True, pressing the escape key closes a tab/window"
 msgstr ""
 
+#. yes, no, ask
+#: ../src/common/config.py:230
+msgid "Jabberd2 workaround"
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+
 #: ../src/common/config.py:287
 msgid "Sleeping"
 msgstr "正在睡觉"
@@ -4327,181 +4429,97 @@ msgstr ""
 "MUC （多用户会议）消息到达时播放的声音。(此设置只在“提示所有 MUC 消息”为真的"
 "时候对生效)"
 
-#. sorted alphanum
-#: ../src/common/config.py:308 ../src/common/optparser.py:181
+#: ../src/common/config.py:310 ../src/common/optparser.py:181
 msgid "green"
 msgstr "绿色"
 
-#: ../src/common/config.py:312 ../src/common/optparser.py:167
+#: ../src/common/config.py:314 ../src/common/optparser.py:167
 msgid "grocery"
 msgstr "杂货店"
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:318
 msgid "human"
 msgstr "人类"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:322
 msgid "marine"
 msgstr "海洋"
 
-#: ../src/common/config.py:324 ../src/common/optparser.py:167
-msgid "plain"
-msgstr "高原"
-
-#: ../src/common/connection.py:68
-#, fuzzy
-msgid "Unable to load idle module"
-msgstr "无法加入房间"
-
-#. password required to join
-#. we are banned
-#. room does not exist
-#: ../src/common/connection.py:559 ../src/common/connection.py:562
-#: ../src/common/connection.py:565 ../src/common/connection.py:568
-#: ../src/common/connection.py:571 ../src/common/connection.py:574
-#: ../src/common/connection.py:582
-msgid "Unable to join room"
-msgstr "无法加入房间"
-
-#: ../src/common/connection.py:560
-msgid "A password is required to join this room."
-msgstr "该房间要求密码才能加入"
-
-#: ../src/common/connection.py:563
-msgid "You are banned from this room."
-msgstr "您被该房间封禁。"
-
-#: ../src/common/connection.py:566
-msgid "Such room does not exist."
-msgstr "不存在这样的房间"
-
-#: ../src/common/connection.py:569
-msgid "Room creation is restricted."
-msgstr "房间创建受限。"
-
-#: ../src/common/connection.py:572
-msgid "Your registered nickname must be used."
-msgstr "您注册的昵称已被使用"
-
-#: ../src/common/connection.py:575
-msgid "You are not in the members list."
-msgstr "您不在成员名单中。"
-
-#: ../src/common/connection.py:583
-msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"您申请的昵称正在使用或被其他人占有。\n"
-"从下列昵称中另外指定一个："
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:2264
-msgid "I would like to add you to my roster."
-msgstr "我申请添加您到联系人名单"
-
-#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:615
-#, python-format
-msgid "we are now subscribed to %s"
-msgstr " %s 请求认证"
-
-#: ../src/common/connection.py:617
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr " %s 请求解除认证"
-
-#: ../src/common/connection.py:619
-#, python-format
-msgid "we are now unsubscribed from %s"
-msgstr "%s 解除了认证"
-
-#: ../src/common/connection.py:656 ../src/common/connection.py:676
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:148
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帐户“%s”的连接丢失"
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:677
-#: ../src/common/connection.py:708
+#: ../src/common/connection.py:149
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "您需要重新连接才能继续收发消息。"
 
-#: ../src/common/connection.py:1464
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s 不识配 RFC，未被加入名单。请使用诸如 http://jru.jabberstudio.org/ 的名"
-"单管理工具移除。"
-
-#. data is (agent, DataFrom, is_form)
-#. wrong answer
-#: ../src/common/connection.py:1680
-#, fuzzy
-msgid "Invalid answer"
-msgstr "无效密码"
-
-#: ../src/common/connection.py:1681
+#: ../src/common/connection.py:163 ../src/common/connection.py:189
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
-#: ../src/common/connection.py:1852 ../src/common/connection.py:1946
-#: ../src/common/connection.py:2357
+#. wrong answer
+#: ../src/common/connection.py:188
+#, fuzzy
+msgid "Invalid answer"
+msgstr "无效密码"
+
+#: ../src/common/connection.py:342 ../src/common/connection.py:378
+#: ../src/common/connection.py:754
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "尚未连接到“%s”"
 
-#: ../src/common/connection.py:1864
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "连接到服务器 %s:%s 通过 %s"
 
-#: ../src/common/connection.py:1947
+#: ../src/common/connection.py:379
 msgid "Check your connection or try again later"
 msgstr "检查连接并稍后重试"
 
-#: ../src/common/connection.py:1972
+#: ../src/common/connection.py:404
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "“%s”登录验证失败"
 
-#: ../src/common/connection.py:1973
+#: ../src/common/connection.py:405
 msgid "Please check your login and password for correctness."
 msgstr "请检查登录信息和密码的正确性"
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:2053
+#: ../src/common/connection.py:486
 msgid "OpenPGP passphrase was not given"
 msgstr "未获得 OpenPGP 密文"
 
 #. %s is the account name here
-#: ../src/common/connection.py:2055
+#: ../src/common/connection.py:488
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "您将在无 OpenPGP 情况下连接到 %s。"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:2094
+#: ../src/common/connection.py:525
 msgid "invisible"
 msgstr "隐身"
 
-#: ../src/common/connection.py:2095
+#: ../src/common/connection.py:526
 msgid "offline"
 msgstr "离线"
 
-#: ../src/common/connection.py:2096
+#: ../src/common/connection.py:527
 #, python-format
 msgid "I'm %s"
 msgstr "我是 %s"
 
 #. we're not english
-#: ../src/common/connection.py:2176
+#: ../src/common/connection.py:611
 msgid "[This message is encrypted]"
 msgstr "[本条消息已加密]"
 
-#: ../src/common/connection.py:2214
+#: ../src/common/connection.py:649
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4510,207 +4528,206 @@ msgstr ""
 "主题：%s\n"
 "%s"
 
-#: ../src/common/connection.py:2324
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "代理 %s 所需的注册信息未按时抵达"
+#: ../src/common/connection.py:699
+msgid "I would like to add you to my roster."
+msgstr "我申请添加您到联系人名单"
 
-#: ../src/common/helpers.py:101
+#: ../src/common/helpers.py:105
 msgid "Invalid character in username."
 msgstr "无效的用户名特征。"
 
-#: ../src/common/helpers.py:106
+#: ../src/common/helpers.py:110
 msgid "Server address required."
 msgstr "此处需要服务器地址"
 
-#: ../src/common/helpers.py:111
+#: ../src/common/helpers.py:115
 msgid "Invalid character in hostname."
 msgstr "无效的主机名特征。"
 
-#: ../src/common/helpers.py:117
+#: ../src/common/helpers.py:121
 msgid "Invalid character in resource."
 msgstr "无效的资源特征。"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:161
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:164
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:168
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:175
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:174
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:191
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:193
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/common/helpers.py:192
+#: ../src/common/helpers.py:196
 msgid "_Not Available"
 msgstr "不可用(_N)"
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:198
 msgid "Not Available"
 msgstr "不可用"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:201
 msgid "_Free for Chat"
 msgstr "自由聊天(_F)"
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:203
 msgid "Free for Chat"
 msgstr "自由聊天"
 
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:206
 msgid "_Available"
 msgstr "在线(_A)"
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:208
 msgid "Available"
 msgstr "在线"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:210
 msgid "Connecting"
 msgstr "正在连接"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:213
 msgid "A_way"
 msgstr "离开(_A)"
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:215
 msgid "Away"
 msgstr "离开"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:218
 msgid "_Offline"
 msgstr "离线(_O)"
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:220
 msgid "Offline"
 msgstr "离线"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:223
 msgid "_Invisible"
 msgstr "隐身(_I)"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:225
 msgid "Invisible"
 msgstr "隐身"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:229
 msgid "?contact has status:Unknown"
 msgstr "?contact has status: 未知"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:231
 msgid "?contact has status:Has errors"
 msgstr "?contact has status: 有错误"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:236
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have: 无"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:238
 msgid "To"
 msgstr "到"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:240
 msgid "From"
 msgstr "来自"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:242
 msgid "Both"
 msgstr "双方"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:250
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription): 无"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:252
 msgid "Subscribe"
 msgstr "认证"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:261
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role: 无"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:264
 msgid "Moderators"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:266
 msgid "Moderator"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:269
 msgid "Participants"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:271
 msgid "Participant"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:274
 msgid "Visitors"
 msgstr "访客"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:276
 msgid "Visitor"
 msgstr "访客"
 
-#: ../src/common/helpers.py:308
+#: ../src/common/helpers.py:312
 msgid "is paying attention to the conversation"
 msgstr "正在专注于聊天"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:314
 msgid "is doing something else"
 msgstr "在做其他事"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:316
 msgid "is composing a message..."
 msgstr "正在输入消息..."
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:315
+#: ../src/common/helpers.py:319
 msgid "paused composing a message"
 msgstr "中断输入消息"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:321
 msgid "has closed the chat window or tab"
 msgstr "关闭了聊天窗口或标签"
 
@@ -4720,10 +4737,103 @@ msgstr "关闭了聊天窗口或标签"
 msgid "error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
+#: ../src/common/optparser.py:167
+msgid "plain"
+msgstr "高原"
+
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "青色"
 
+#~ msgid "Send"
+#~ msgstr "发送"
+
+#~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
+#~ msgstr "房间 %(room_name)s 的 %(nickname)s 向您发送了一条新消息。"
+
+#~ msgid "%s has sent you a new message."
+#~ msgstr "%s 给您发送了一条新消息。"
+
+#, fuzzy
+#~ msgid "GUI Migration failed"
+#~ msgstr "vCard 发布失败"
+
+#~ msgid "Logs have been successfully migrated to the database."
+#~ msgstr "日志被成功移动到数据库。"
+
+#~ msgid "If checked, Gajim will also have a trayicon"
+#~ msgstr "如果选定，Gajim 同样可以显示系统托盘图标"
+
+#~ msgid "Profile, Avatar"
+#~ msgstr "模板，明细"
+
+#~ msgid "_Online Users"
+#~ msgstr "在线用户(_O)"
+
+#, fuzzy
+#~ msgid "Start Chat with Contact"
+#~ msgstr "使用账户 %s 加入群聊"
+
+#~ msgid "All contacts in this group are offline or have errors"
+#~ msgstr "该组中所有联系人离线或有错误"
+
+#~ msgid "Size: "
+#~ msgstr "大小："
+
+#~ msgid "Session bus is not available"
+#~ msgstr "会话总线不可用"
+
+#, fuzzy
+#~ msgid "Unable to load idle module"
+#~ msgstr "无法加入房间"
+
+#~ msgid "Unable to join room"
+#~ msgstr "无法加入房间"
+
+#~ msgid "A password is required to join this room."
+#~ msgstr "该房间要求密码才能加入"
+
+#~ msgid "You are banned from this room."
+#~ msgstr "您被该房间封禁。"
+
+#~ msgid "Such room does not exist."
+#~ msgstr "不存在这样的房间"
+
+#~ msgid "Room creation is restricted."
+#~ msgstr "房间创建受限。"
+
+#~ msgid "Your registered nickname must be used."
+#~ msgstr "您注册的昵称已被使用"
+
+#~ msgid "You are not in the members list."
+#~ msgstr "您不在成员名单中。"
+
+#~ msgid ""
+#~ "Your desired nickname is in use or registered by another occupant.\n"
+#~ "Please specify another nickname below:"
+#~ msgstr ""
+#~ "您申请的昵称正在使用或被其他人占有。\n"
+#~ "从下列昵称中另外指定一个："
+
+#~ msgid "we are now subscribed to %s"
+#~ msgstr " %s 请求认证"
+
+#~ msgid "unsubscribe request from %s"
+#~ msgstr " %s 请求解除认证"
+
+#~ msgid "we are now unsubscribed from %s"
+#~ msgstr "%s 解除了认证"
+
+#~ msgid ""
+#~ "JID %s is not RFC compliant. It will not be added to your roster. Use "
+#~ "roster management tools such as http://jru.jabberstudio.org/ to remove it"
+#~ msgstr ""
+#~ "JID %s 不识配 RFC，未被加入名单。请使用诸如 http://jru.jabberstudio.org/ "
+#~ "的名单管理工具移除。"
+
+#~ msgid "Registration information for transport %s has not arrived in time"
+#~ msgstr "代理 %s 所需的注册信息未按时抵达"
+
 #~ msgid "Sound"
 #~ msgstr "声音"
 
diff --git a/scripts/dev/translations.py b/scripts/dev/translations.py
index 4f0c60ad7..f5eb05479 100755
--- a/scripts/dev/translations.py
+++ b/scripts/dev/translations.py
@@ -37,6 +37,8 @@ def show_help():
 def update_pot():
 	# create header for glade strings
 	os.system('intltool-extract --type=gettext/glade ../../src/gtkgui.glade')
+	os.system('intltool-extract --type=gettext/glade ../../src/'
+		'history_manager.glade')
 	# update the pot
 	os.system('make -C ../../po/ all gajim.pot')
 	print 'gajim.pot was updated successfully'